egl: Drop the non-builtin-drivers support.

The two drivers both did builtin mode, so drop the non-builtin build
system.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/egl/drivers/Makefile.template b/src/egl/drivers/Makefile.template
index 76dbe260c6b77c8917c3549f67593679107720e0..e96f99755401482f05417d2ad86496c6d5a31748 100644 (file)
--- a/src/egl/drivers/Makefile.template
+++ b/src/egl/drivers/Makefile.template
@@ -2,7 +2,6 @@
 #
 # Drivers should define
 #
-# EGL_BUILTIN, the driver is built-in or external
 # EGL_DRIVER, the driver name
 # EGL_SOURCES, the driver sources
 # EGL_INCLUDES, the include pathes
@@ -12,30 +11,9 @@
 # before including this template.
 #
 
-
-EGL_DRIVER_PATH = $(TOP)/$(LIB_DIR)/egl/$(EGL_DRIVER).so
 EGL_OBJECTS = $(EGL_SOURCES:.c=.o)
 
-# built-in or external
-ifeq ($(EGL_BUILTIN),true)
-EGL_TARGET = lib$(EGL_DRIVER).a
-EGL_INSTALL =
-else
-EGL_TARGET = $(EGL_DRIVER_PATH)
-EGL_INSTALL = install-so
-endif
-
-default: depend $(EGL_TARGET)
-
-$(EGL_DRIVER_PATH): $(EGL_DRIVER).so
-       @$(INSTALL) -d $(TOP)/$(LIB_DIR)/egl
-       $(INSTALL) $< $(TOP)/$(LIB_DIR)/egl
-
-$(EGL_DRIVER).so: $(EGL_OBJECTS) Makefile $(TOP)/src/egl/drivers/Makefile.template
-       @$(MKLIB) -o $(EGL_DRIVER).so -noprefix \
-               -linker '$(CC)' -ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \
-               $(MKLIB_OPTIONS) \
-               $(EGL_OBJECTS) $(EGL_LIBS) -l$(EGL_LIB)
+default: depend lib$(EGL_DRIVER).a
 
 lib$(EGL_DRIVER).a: $(EGL_OBJECTS) Makefile $(TOP)/src/egl/drivers/Makefile.template
        @$(MKLIB) -o $(EGL_DRIVER) -static $(EGL_OBJECTS)
@@ -43,11 +21,7 @@ lib$(EGL_DRIVER).a: $(EGL_OBJECTS) Makefile $(TOP)/src/egl/drivers/Makefile.temp
 .c.o:
        $(CC) -c $(EGL_INCLUDES) $(CFLAGS) $(EGL_CFLAGS) $< -o $@
 
-install-so: $(EGL_DRIVER_PATH)
-       $(INSTALL) -d $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR)
-       $(MINSTALL) $(EGL_DRIVER_PATH) $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR)
-
-install: $(EGL_INSTALL)
+install:
 
 clean:
        rm -f $(EGL_DRIVER).so

diff --git a/src/egl/drivers/dri2/Makefile b/src/egl/drivers/dri2/Makefile
index 305a739d11a5e3061f7804bf6725af97d7dd4a00..1086ce28be51af084f187137c999258d6e428028 100644 (file)
--- a/src/egl/drivers/dri2/Makefile
+++ b/src/egl/drivers/dri2/Makefile
@@ -18,8 +18,6 @@ EGL_INCLUDES = \
 
 EGL_LIBS = $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB)
 
-EGL_BUILTIN = true
-
 ifeq ($(SHARED_GLAPI),1)
 EGL_CFLAGS += -DHAVE_SHARED_GLAPI
 endif