egl: Build drivers in $(TOP)/$(LIB_DIR)/egl.

There are enough EGL modules that they deserve a subdirectory, to avoid
polluting $(TOP)/$(LIB_DIR).

diff --git a/src/egl/drivers/Makefile.template b/src/egl/drivers/Makefile.template
index e9a614ce62ddcf52646ba22d0f300c185fd97b9d..ca2f7d5b3ad03f0d70fdc45d3eaf75b100e9afcf 100644 (file)
--- 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 9265e2eb7bc8da6d8d08fdea7daba6868c6f2a9f..7e65411e9825e4c54f0caedb7242cbf891b586a9 100644 (file)
--- 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)' \