Remove arbitrary division between xcb_types and xproto by merging

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

diff --git a/src/Makefile.am b/src/Makefile.am
index ecb65c2..f62c6e7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,14 +71,13 @@ ESSENTIAL_EXTENSIONS = \
                extensions/xc_misc.h \
                extensions/xc_misc.c
 
-COREHEADERS = xproto.h xcb_types.h
-CORESOURCES = xproto.c xcb_types.c
+COREHEADERS = xproto.h
+CORESOURCES = xproto.c
 COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
-CFLAGS =
 AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
 libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
 libXCB_la_SOURCES = \
@@ -100,7 +99,7 @@ CLEANFILES = $(COREPROTO) $(EXTENSIONS)
 clean-local:
        rmdir extensions || true
 
-XCB_LIBS = $(top_builddir)/src/libXCB.la
+XCB_LIBS = libXCB.la
 
 # FIXME: find a way to autogenerate this from the XML files.