From 3b28aab1614bb22ca12ce7ebd5aa5ff0d87309ec Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 5 Jun 2008 14:11:54 -0600
Subject: egl: updated SUBDIRS

---
 src/egl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/egl/Makefile')

diff --git a/src/egl/Makefile b/src/egl/Makefile
index 931e9d0cb8..082d762183 100644
--- a/src/egl/Makefile
+++ b/src/egl/Makefile
@@ -2,7 +2,7 @@
 
 TOP = ../..
 
-SUBDIRS = main drivers/demo drivers/dri
+SUBDIRS = main drivers
 
 
 default: subdirs
-- 
cgit v1.2.3


From 1e81855566b8c9957b39ee4612cec24bea591785 Mon Sep 17 00:00:00 2001
From: Johannes Engel <jcnengel@googlemail.com>
Date: Wed, 11 Feb 2009 11:31:05 +0100
Subject: Add install target for egl

Signed-off-by: Johannes Engel <jcnengel@googlemail.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
---
 src/egl/Makefile              | 7 +++++++
 src/egl/drivers/Makefile      | 6 ++++++
 src/egl/drivers/demo/Makefile | 4 +++-
 src/egl/drivers/dri/Makefile  | 2 ++
 src/egl/drivers/glx/Makefile  | 2 ++
 src/egl/drivers/xdri/Makefile | 2 ++
 src/egl/main/Makefile         | 4 +++-
 7 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'src/egl/Makefile')

diff --git a/src/egl/Makefile b/src/egl/Makefile
index 024453f8bb..5b09e178c6 100644
--- a/src/egl/Makefile
+++ b/src/egl/Makefile
@@ -1,6 +1,7 @@
 # src/egl/Makefile
 
 TOP = ../..
+include $(TOP)/configs/current
 
 SUBDIRS = main drivers
 
@@ -15,6 +16,12 @@ subdirs:
 		fi \
 	done
 
+install:
+	@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) install) || exit 1 ; \
+		fi \
+	done
 
 clean:
 	-@for dir in $(SUBDIRS) ; do \
diff --git a/src/egl/drivers/Makefile b/src/egl/drivers/Makefile
index f0538f563f..dde4ee2255 100644
--- a/src/egl/drivers/Makefile
+++ b/src/egl/drivers/Makefile
@@ -16,6 +16,12 @@ subdirs:
 		fi \
 	done
 
+install:
+	@ for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir ; $(MAKE) install) || exit 1 ; \
+		fi \
+	done
 
 clean:
 	@for dir in $(SUBDIRS) ; do \
diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile
index 6ca25aa5d6..d908cdb4b2 100644
--- a/src/egl/drivers/demo/Makefile
+++ b/src/egl/drivers/demo/Makefile
@@ -25,7 +25,9 @@ $(TOP)/$(LIB_DIR)/demodriver.so: $(OBJECTS)
 		-ldflags '$(LDFLAGS)' -install $(TOP)/$(LIB_DIR) \
 		$(OBJECTS)
 
-
+install:
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) $(TOP)/$(LIB_DIR)/demodriver.so $(DESTDIR)$(INSTALL_LIB_DIR)
 
 clean:
 	-rm -f *.o
diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile
index d7eba653b2..be2f9b6bea 100644
--- a/src/egl/drivers/dri/Makefile
+++ b/src/egl/drivers/dri/Makefile
@@ -48,6 +48,8 @@ $(TOP)/$(LIB_DIR)/libEGLdri.so: $(OBJECTS)
 		-major 1 -minor 0 \
 		-install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) $(LIBS)
 
+install: $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) $(TOP)/$(LIB_DIR)/libEGLdri.so $(DESTDIR)$(INSTALL_LIB_DIR)
 
 clean:
 	-rm -f *.o
diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile
index 3cd5276513..090a230ca3 100644
--- a/src/egl/drivers/glx/Makefile
+++ b/src/egl/drivers/glx/Makefile
@@ -56,6 +56,8 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(OBJECTS)
 		-install $(TOP)/$(LIB_DIR) \
 		$(OBJECTS) $(DRM_LIB) $(MISC_LIBS)
 
+install: $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
 
 clean:
 	rm -f *.o
diff --git a/src/egl/drivers/xdri/Makefile b/src/egl/drivers/xdri/Makefile
index a721b997e6..db4b710002 100644
--- a/src/egl/drivers/xdri/Makefile
+++ b/src/egl/drivers/xdri/Makefile
@@ -52,6 +52,8 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(OBJECTS)
 		-install $(TOP)/$(LIB_DIR) \
 		$(OBJECTS) $(DRM_LIB) $(MISC_LIBS)
 
+install: $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
 
 clean:
 	rm -f *.o
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 8ea60c0199..89b4a200bc 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -65,7 +65,9 @@ $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS)
 		-major 1 -minor 0 \
 		-install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) $(LIBS)
 
-
+install:
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) $(TOP)/$(LIB_DIR)/libEGL.so* $(DESTDIR)$(INSTALL_LIB_DIR)
 
 clean:
 	-rm -f *.o *.so*
-- 
cgit v1.2.3