Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d43475..41c261e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,16 +49,13 @@ COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
 
 CFLAGS =
-AM_CFLAGS = -include config.h $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS)
-libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS)
+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 = \
                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 xcb_des.c \
+               xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
                $(COREPROTO) $(EXTENSIONS)
 
-xcb_des.c:
-       touch xcb_des.c
-
 BUILT_SOURCES = $(COREPROTO) $(EXTENSIONS)
 CLEANFILES = $(COREPROTO) $(EXTENSIONS)
 clean-local: