fix all the occurence where a drawable where considered as a union

[free-sw/xcb/libxcb] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index adcfc98..b02caf3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,8 +94,8 @@ EXTENSION_XML = xproto.xml \
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
-AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
-libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
+AM_CFLAGS = $(CWARNFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
+libxcb_la_LIBADD = $(NEEDED_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_auth.c c-client.xsl \
@@ -220,7 +220,4 @@ SUFFIXES = .xml
                    -o $@ $(srcdir)/c-client.xsl $< 
 
 $(EXTENSION_XML):
-       for i in $(EXTENSION_XML) ; do \
-           rm -f $$i ; \
-           $(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/$$i $$i ; \
-        done
+       $(LN_S) -f $(XCBPROTO_XCBINCLUDEDIR)/$@ $@