xlib: move state tracker to glx/xlib

Also, remove makefile hacks.

11 files changed, 28 insertions, 3 deletions

diff --git a/src/gallium/state_trackers/Makefile b/src/gallium/state_trackers/Makefile
index 7e8cc03854..07b3fbf311 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 0000000000..f779035763
--- /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 442d99d638..1b63db1f0e 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 65e7048188..65e7048188 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 e5fd960072..e5fd960072 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 e359046756..e359046756 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 1ff04804f1..1ff04804f1 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 b4e12b4162..b4e12b4162 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 82d125b5f3..82d125b5f3 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 2b8302d174..2b8302d174 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 b22d65a569..b22d65a569 100644
--- a/src/gallium/state_trackers/xlib/xm_winsys.h
+++ b/src/gallium/state_trackers/glx/xlib/xm_winsys.h