X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fwinsys%2Fegl_xlib%2FMakefile;h=76f1b56da42a1cecb98b7b98acbc58ab87b00d08;hb=f637a96e85a51a66f2c53b91118a6815bb61d6e6;hp=fe4b931e3005c57e447f5cd315ed7737e21880c0;hpb=5b6ea6bfc80fe96755ca4569048b59baa561f22a;p=mesa.git

diff --git a/src/gallium/winsys/egl_xlib/Makefile b/src/gallium/winsys/egl_xlib/Makefile
index fe4b931e300..76f1b56da42 100644
--- a/src/gallium/winsys/egl_xlib/Makefile
+++ b/src/gallium/winsys/egl_xlib/Makefile
@@ -1,13 +1,13 @@
 # src/gallium/winsys/egl_xlib/Makefile
 
-# Build softpipe/xlib/EGL driver library/object: "softpipe_egl.so"
+# Build softpipe/xlib/EGL driver library/object: "egl_softpipe.so"
 
 
 TOP = ../../../..
 include $(TOP)/configs/current
 
 
-LIBNAME = softpipe_egl.so
+DRIVER_NAME = egl_softpipe.so
 
 
 INCLUDE_DIRS = \
@@ -28,37 +28,39 @@ WINSYS_OBJECTS = $(WINSYS_SOURCES:.c=.o)
 
 LIBS = \
 	$(GALLIUM_DRIVERS) \
+	$(GALLIUM_AUXILIARIES)
+
+# XXX temporary (should create a separate lib with the GL API funcs and
+# mesa code, as done for ES 1.x, 2.x, OpenVG, etc)
+UNUSED_LIBS = \
 	$(TOP)/src/mesa/libglapi.a \
 	$(TOP)/src/mesa/libmesa.a \
-	$(GALLIUM_AUXILIARIES)
 
 
 LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1
 
 
-.SUFFIXES : .cpp
-
 .c.o:
 	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
 
-.cpp.o:
-	$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $(LOCAL_CFLAGS) $< -o $@
 
+.PHONY: library
 
 
-default: $(TOP)/$(LIB_DIR)/$(LIBNAME)
+default: depend library Makefile
 
 
-# Make the softpipe_egl.so library
-$(TOP)/$(LIB_DIR)/$(LIBNAME): $(WINSYS_OBJECTS) $(LIBS)
-	$(TOP)/bin/mklib -o $(LIBNAME) \
+library: $(TOP)/$(LIB_DIR)/$(DRIVER_NAME)
+
+
+# Make the egl_softpipe.so library
+$(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(WINSYS_OBJECTS) $(LIBS)
+	$(TOP)/bin/mklib -o $(DRIVER_NAME) \
 		-linker "$(CC)" \
 		-noprefix \
 		-install $(TOP)/$(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(WINSYS_OBJECTS) \
-		--start-group $(LIBS) --end-group
-
-# $(GL_LIB_DEPS)
+		--whole-archive $(LIBS) --no-whole-archive
 
 
 depend: $(ALL_SOURCES)
@@ -72,7 +74,7 @@ depend: $(ALL_SOURCES)
 install: default
 	$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
 	@if [ -e $(TOP)/$(LIB_DIR) ]; then \
-		$(INSTALL) $(TOP)/$(LIB_DIR)/$(LIBNAME) $(INSTALL_DIR)/$(LIB_DIR); \
+		$(INSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(INSTALL_DIR)/$(LIB_DIR); \
 	fi