From d4e768fc32ff9ce79a4259d252f4a4a4b11d5db8 Mon Sep 17 00:00:00 2001
From: Bart Massey <bart@cs.pdx.edu>
Date: Tue, 12 Sep 2006 00:42:11 -0700
Subject: [PATCH] Cleaned up previous fix for GNU Make stuff. Got "make
 distcheck" to work (whatever that does).

---
 src/Makefile.am       | 97 ++++++++++++++-----------------------------
 src/extensions/README |  3 --
 2 files changed, 32 insertions(+), 68 deletions(-)
 delete mode 100644 src/extensions/README

diff --git a/src/Makefile.am b/src/Makefile.am
index 47e43d8..43f7236 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,29 @@ ESSENTIAL_EXTENSIONS = \
 		extensions/xc_misc.h \
 		extensions/xc_misc.c
 
+EXTENSION_XML = \
+		extensions/bigreq.xml \
+		extensions/composite.xml \
+		extensions/damage.xml \
+		extensions/dpms.xml \
+		extensions/glx.xml \
+		extensions/randr.xml \
+		extensions/record.xml \
+		extensions/render.xml \
+		extensions/res.xml \
+		extensions/screensaver.xml \
+		extensions/shape.xml \
+		extensions/shm.xml \
+		extensions/sync.xml \
+		extensions/xc_misc.xml \
+		extensions/xevie.xml \
+		extensions/xf86dri.xml \
+		extensions/xfixes.xml \
+		extensions/xprint.xml \
+		extensions/xtest.xml \
+		extensions/xvmc.xml \
+		extensions/xv.xml
+
 COREHEADERS = xproto.h
 CORESOURCES = xproto.c
 COREPROTO   = $(CORESOURCES) $(COREHEADERS)
@@ -83,7 +106,7 @@ libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
 libXCB_la_SOURCES = \
 		xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
 		xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
-		$(COREPROTO) $(ESSENTIAL_EXTENSIONS)
+		$(COREPROTO) $(ESSENTIAL_EXTENSIONS) c-client.xsl
 
 # Explanation for -version-info:
 # -version-info current:revision:age
@@ -198,67 +221,11 @@ SUFFIXES = .xml
 	            -o $@ $(srcdir)/c-client.xsl $< 
 
 xproto.xml: $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml
-	ln -s $< $@
-
-extensions/bigreq.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/bigreq.xml
-	ln -s $< $@
-
-extensions/composite.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/composite.xml
-	ln -s $< $@
-
-extensions/damage.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/damage.xml
-	ln -s $< $@
-
-extensions/dpms.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/dpms.xml
-	ln -s $< $@
-
-extensions/glx.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/glx.xml
-	ln -s $< $@
-
-extensions/randr.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/randr.xml
-	ln -s $< $@
-
-extensions/record.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/record.xml
-	ln -s $< $@
-
-extensions/render.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/render.xml
-	ln -s $< $@
-
-extensions/res.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/res.xml
-	ln -s $< $@
-
-extensions/screensaver.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/screensaver.xml
-	ln -s $< $@
-
-extensions/shape.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/shape.xml
-	ln -s $< $@
-
-extensions/shm.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/shm.xml
-	ln -s $< $@
-
-extensions/sync.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/sync.xml
-	ln -s $< $@
-
-extensions/xc_misc.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xc_misc.xml
-	ln -s $< $@
-
-extensions/xevie.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xevie.xml
-	ln -s $< $@
-
-extensions/xf86dri.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xf86dri.xml
-	ln -s $< $@
-
-extensions/xfixes.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xfixes.xml
-	ln -s $< $@
-
-extensions/xprint.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xprint.xml
-	ln -s $< $@
-
-extensions/xtest.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xtest.xml
-	ln -s $< $@
-
-extensions/xvmc.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xvmc.xml
-	ln -s $< $@
-
-extensions/xv.xml: $(XCBPROTO_XCBINCLUDEDIR)/extensions/xv.xml
-	ln -s $< $@
+	$(LN_S) $< $@
+
+$(EXTENSION_XML):
+	[ -d extensions ] || mkdir extensions
+	for i in $(EXTENSION_XML) ; do \
+           rm -f $$i ; \
+           $(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/$$i $$i ; \
+        done
diff --git a/src/extensions/README b/src/extensions/README
deleted file mode 100644
index 21d6d06..0000000
--- a/src/extensions/README
+++ /dev/null
@@ -1,3 +0,0 @@
-It is convenient not to have to teach Makefile.am when to
-create this directory, but GIT won't track an empty
-directory.  Hence this file.  Sorry.
-- 
2.34.1