Module: Mesa Branch: master Commit: 1e81855566b8c9957b39ee4612cec24bea591785 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e81855566b8c9957b39ee4612cec24bea591785
Author: Johannes Engel <[email protected]> Date: Wed Feb 11 11:31:05 2009 +0100 Add install target for egl Signed-off-by: Johannes Engel <[email protected]> Acked-by: Jakob Bornecrantz <[email protected]> --- 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(-) diff --git a/src/egl/Makefile b/src/egl/Makefile index 024453f..5b09e17 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 f0538f5..dde4ee2 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 6ca25aa..d908cdb 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 d7eba65..be2f9b6 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 3cd5276..090a230 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 a721b99..db4b710 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 8ea60c0..89b4a20 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* _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
