From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 6 Jun 2008 21:42:08 +0000 (-0600)
Subject: egl: clean-ups
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab102d5a9f1db0f76eabbf22cd05b08ff7bb8448;p=mesa.git

egl: clean-ups
---

diff --git a/src/gallium/winsys/egl_xlib/Makefile b/src/gallium/winsys/egl_xlib/Makefile
index fe4b931e300..46666650b06 100644
--- a/src/gallium/winsys/egl_xlib/Makefile
+++ b/src/gallium/winsys/egl_xlib/Makefile
@@ -7,7 +7,7 @@ TOP = ../../../..
 include $(TOP)/configs/current
 
 
-LIBNAME = softpipe_egl.so
+DRIVER_NAME = softpipe_egl.so
 
 
 INCLUDE_DIRS = \
@@ -36,30 +36,28 @@ LIBS = \
 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: depend library Makefile
 
-default: $(TOP)/$(LIB_DIR)/$(LIBNAME)
+
+library: $(TOP)/$(LIB_DIR)/$(DRIVER_NAME)
 
 
 # Make the softpipe_egl.so library
-$(TOP)/$(LIB_DIR)/$(LIBNAME): $(WINSYS_OBJECTS) $(LIBS)
-	$(TOP)/bin/mklib -o $(LIBNAME) \
+$(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)
-
 
 depend: $(ALL_SOURCES)
 	@ echo "running $(MKDEP)"
@@ -72,7 +70,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