Quit treating xproto specially: handle it like all the extensions.

diff --git a/src/Makefile.am b/src/Makefile.am
index eb7950a..adcfc98 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libxcb.la \
                   libxcb-xv.la \
                   libxcb-xvmc.la
 
-EXTHEADERS = \
+EXTHEADERS =   xproto.h \
                bigreq.h \
                composite.h \
                damage.h \
@@ -44,7 +44,7 @@ EXTHEADERS = \
                xtest.h \
                xv.h \
                xvmc.h
-EXTSOURCES = \
+EXTSOURCES =   xproto.c \
                bigreq.c \
                composite.c \
                damage.c \
@@ -67,15 +67,7 @@ EXTSOURCES = \
                xtest.c \
                xv.c \
                xvmc.c
-EXTENSIONS = $(EXTSOURCES) $(EXTHEADERS)
-
-ESSENTIAL_EXTENSIONS = \
-               bigreq.h \
-               bigreq.c \
-               xc_misc.h \
-               xc_misc.c
-
-EXTENSION_XML = \
+EXTENSION_XML = xproto.xml \
                bigreq.xml \
                composite.xml \
                damage.xml \
@@ -99,19 +91,15 @@ EXTENSION_XML = \
                xvmc.xml \
                xv.xml
 
-COREHEADERS = xproto.h
-CORESOURCES = xproto.c
-COREPROTO   = $(CORESOURCES) $(COREHEADERS)
-
-xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
+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)
 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 \
-               $(COREPROTO) $(ESSENTIAL_EXTENSIONS) c-client.xsl
+               xcb_list.c xcb_util.c xcb_auth.c c-client.xsl \
+               xproto.c bigreq.c xc_misc.c
 
 # Explanation for -version-info:
 # -version-info current:revision:age
@@ -122,8 +110,8 @@ libxcb_la_SOURCES = \
 #   and age to 0.
 libxcb_la_LDFLAGS = -version-info 1:0:0
 
-BUILT_SOURCES = $(COREPROTO) $(EXTENSIONS)
-CLEANFILES = $(COREPROTO) $(EXTENSIONS)
+BUILT_SOURCES = $(EXTSOURCES) $(EXTHEADERS)
+CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(EXTENSION_XML)
 
 XCB_LIBS = libxcb.la
 
@@ -231,9 +219,6 @@ SUFFIXES = .xml
                    --stringparam extension-path $(XCBPROTO_XCBINCLUDEDIR)/ \
                    -o $@ $(srcdir)/c-client.xsl $< 
 
-xproto.xml: $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml
-       $(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml $@
-
 $(EXTENSION_XML):
        for i in $(EXTENSION_XML) ; do \
            rm -f $$i ; \