xlib: move state tracker to glx/xlib

Also, remove makefile hacks.

12 files changed, 31 insertions, 6 deletions

diff --git a/src/gallium/state_trackers/Makefile b/src/gallium/state_trackers/Makefile
index 7e8cc038545..07b3fbf3119 100644
--- a/src/gallium/state_trackers/Makefile
+++ b/src/gallium/state_trackers/Makefile
@@ -2,7 +2,7 @@ TOP = ../../..
 include $(TOP)/configs/current
 
 
-SUBDIRS = xlib
+SUBDIRS = glx
 
 
 default: subdirs
diff --git a/src/gallium/state_trackers/glx/Makefile b/src/gallium/state_trackers/glx/Makefile
new file mode 100644
index 00000000000..f779035763e
--- /dev/null
+++ b/src/gallium/state_trackers/glx/Makefile
@@ -0,0 +1,25 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+
+SUBDIRS = xlib
+
+
+default: subdirs
+
+
+subdirs:
+	@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE)) || exit 1 ; \
+		fi \
+	done
+
+
+clean:
+	rm -f `find . -name \*.[oa]`
+	rm -f `find . -name depend`
+
+
+# Dummy install target
+install:
diff --git a/src/gallium/state_trackers/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile
index 442d99d638c..1b63db1f0ea 100644
--- a/src/gallium/state_trackers/xlib/Makefile
+++ b/src/gallium/state_trackers/glx/xlib/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../..
+TOP = ../../../../..
 include $(TOP)/configs/current
 
 LIBNAME = xlib
@@ -19,7 +19,7 @@ C_SOURCES = \
 	xm_api.c
 
 
-include ../../Makefile.template
+include ../../../Makefile.template
 
 symlinks:
 
diff --git a/src/gallium/state_trackers/xlib/fakeglx.c b/src/gallium/state_trackers/glx/xlib/fakeglx.c
index 65e7048188e..65e7048188e 100644
--- a/src/gallium/state_trackers/xlib/fakeglx.c
+++ b/src/gallium/state_trackers/glx/xlib/fakeglx.c
diff --git a/src/gallium/state_trackers/xlib/fakeglx.h b/src/gallium/state_trackers/glx/xlib/fakeglx.h
index e5fd960072e..e5fd960072e 100644
--- a/src/gallium/state_trackers/xlib/fakeglx.h
+++ b/src/gallium/state_trackers/glx/xlib/fakeglx.h
diff --git a/src/gallium/state_trackers/xlib/fakeglx_fonts.c b/src/gallium/state_trackers/glx/xlib/fakeglx_fonts.c
index e3590467563..e3590467563 100644
--- a/src/gallium/state_trackers/xlib/fakeglx_fonts.c
+++ b/src/gallium/state_trackers/glx/xlib/fakeglx_fonts.c
diff --git a/src/gallium/state_trackers/xlib/glxapi.c b/src/gallium/state_trackers/glx/xlib/glxapi.c
index 1ff04804f15..1ff04804f15 100644
--- a/src/gallium/state_trackers/xlib/glxapi.c
+++ b/src/gallium/state_trackers/glx/xlib/glxapi.c
diff --git a/src/gallium/state_trackers/xlib/glxapi.h b/src/gallium/state_trackers/glx/xlib/glxapi.h
index b4e12b4162b..b4e12b4162b 100644
--- a/src/gallium/state_trackers/xlib/glxapi.h
+++ b/src/gallium/state_trackers/glx/xlib/glxapi.h
diff --git a/src/gallium/state_trackers/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 82d125b5f31..82d125b5f31 100644
--- a/src/gallium/state_trackers/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
diff --git a/src/gallium/state_trackers/xlib/xm_api.h b/src/gallium/state_trackers/glx/xlib/xm_api.h
index 2b8302d1747..2b8302d1747 100644
--- a/src/gallium/state_trackers/xlib/xm_api.h
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.h
diff --git a/src/gallium/state_trackers/xlib/xm_winsys.h b/src/gallium/state_trackers/glx/xlib/xm_winsys.h
index b22d65a5699..b22d65a5699 100644
--- a/src/gallium/state_trackers/xlib/xm_winsys.h
+++ b/src/gallium/state_trackers/glx/xlib/xm_winsys.h
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 129d038d4f2..fbc947f363b 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -19,7 +19,7 @@ INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/gallium/drivers \
-	-I$(TOP)/src/gallium/state_trackers/xlib \
+	-I$(TOP)/src/gallium/state_trackers/glx/xlib \
 	-I$(TOP)/src/gallium/auxiliary
 
 XLIB_WINSYS_SOURCES = \
@@ -38,6 +38,7 @@ XLIB_WINSYS_OBJECTS = $(XLIB_WINSYS_SOURCES:.c=.o)
 
 LIBS = \
 	$(GALLIUM_DRIVERS) \
+	$(TOP)/src/gallium/state_trackers/glx/xlib/libxlib.a \
 	$(TOP)/src/mesa/libglapi.a \
 	$(TOP)/src/mesa/libmesa.a \
 	$(GALLIUM_AUXILIARIES) \
@@ -58,13 +59,12 @@ default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
 
 # Make the libGL.so library
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(XLIB_WINSYS_OBJECTS) $(LIBS)
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(XLIB_WINSYS_OBJECTS) $(LIBS) Makefile
 	$(TOP)/bin/mklib -o $(GL_LIB) \
 		-linker "$(CC)" \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(TOP)/$(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(XLIB_WINSYS_OBJECTS) \
-		$(TOP)/src/gallium/state_trackers/xlib/*.o \
 		--start-group $(LIBS) --end-group $(GL_LIB_DEPS)