Mesa (master): egl: Build drivers in $(TOP)/$(LIB_DIR)/egl.
Chia-I Wu
olv at kemper.freedesktop.org
Sat May 8 06:59:50 UTC 2010
Module: Mesa
Branch: master
Commit: 56530c90976e96694a034a04925affd806860f09
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56530c90976e96694a034a04925affd806860f09
Author: Chia-I Wu <olv at lunarg.com>
Date: Fri May 7 15:42:32 2010 +0800
egl: Build drivers in $(TOP)/$(LIB_DIR)/egl.
There are enough EGL modules that they deserve a subdirectory, to avoid
polluting $(TOP)/$(LIB_DIR).
---
src/egl/drivers/Makefile.template | 5 +++--
src/gallium/targets/Makefile.egl | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/egl/drivers/Makefile.template b/src/egl/drivers/Makefile.template
index e9a614c..ca2f7d5 100644
--- a/src/egl/drivers/Makefile.template
+++ b/src/egl/drivers/Makefile.template
@@ -12,14 +12,15 @@
#
-EGL_DRIVER_PATH = $(TOP)/$(LIB_DIR)/$(EGL_DRIVER)
+EGL_DRIVER_PATH = $(TOP)/$(LIB_DIR)/egl/$(EGL_DRIVER)
EGL_OBJECTS = $(EGL_SOURCES:.c=.o)
default: depend $(EGL_DRIVER_PATH)
$(EGL_DRIVER_PATH): $(EGL_DRIVER)
- $(INSTALL) $< $(TOP)/$(LIB_DIR)
+ @$(INSTALL) -d $(TOP)/$(LIB_DIR)/egl
+ $(INSTALL) $< $(TOP)/$(LIB_DIR)/egl
$(EGL_DRIVER): $(EGL_OBJECTS) Makefile $(TOP)/src/egl/drivers/Makefile.template
@$(MKLIB) -o $(EGL_DRIVER) -noprefix \
diff --git a/src/gallium/targets/Makefile.egl b/src/gallium/targets/Makefile.egl
index 9265e2e..7e65411 100644
--- a/src/gallium/targets/Makefile.egl
+++ b/src/gallium/targets/Makefile.egl
@@ -36,12 +36,13 @@ kms_LIBS = $(common_LIBS)
EGL_DISPLAY_DRIVERS = $(foreach dpy, $(EGL_DISPLAYS), egl_$(dpy)_$(EGL_DRIVER_NAME).so)
-EGL_DISPLAY_LIBS = $(foreach drv, $(EGL_DISPLAY_DRIVERS), $(TOP)/$(LIB_DIR)/$(drv))
+EGL_DISPLAY_LIBS = $(foreach drv, $(EGL_DISPLAY_DRIVERS), $(TOP)/$(LIB_DIR)/egl/$(drv))
default: $(EGL_DISPLAY_LIBS)
-$(EGL_DISPLAY_LIBS): $(TOP)/$(LIB_DIR)/%.so: %.so
- $(INSTALL) $< $(TOP)/$(LIB_DIR)
+$(EGL_DISPLAY_LIBS): $(TOP)/$(LIB_DIR)/egl/%.so: %.so
+ @$(INSTALL) -d $(TOP)/$(LIB_DIR)/egl
+ $(INSTALL) $< $(TOP)/$(LIB_DIR)/egl
define mklib-egl
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
More information about the mesa-commit
mailing list