Apple: Apple launchd cleanup

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 2fd2f69..756337a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-lib_LTLIBRARIES = libxcb.la \
-                  libxcb-xlib.la
+lib_LTLIBRARIES = libxcb.la
 
 EXTHEADERS =   xproto.h \
                bigreq.h \
@@ -25,14 +24,10 @@ libxcb_la_SOURCES = \
 # * If you add an interface, increment current and age and set revision to 0.
 # * If you change or remove an interface, increment current and set revision
 #   and age to 0.
-libxcb_la_LDFLAGS = -version-info 1:0:0
+libxcb_la_LDFLAGS = -version-info 2:0:1
 
 XCB_LIBS = libxcb.la
 
-libxcb_xlib_la_LDFLAGS = -version-info 0:0:0
-libxcb_xlib_la_LIBADD = $(XCB_LIBS)
-libxcb_xlib_la_SOURCES = xcb_xlib.c
-
 # FIXME: find a way to autogenerate this from the XML files.
 
 EXTHEADERS += composite.h
@@ -108,7 +103,7 @@ endif
 EXTHEADERS += res.h
 EXTSOURCES += res.c
 EXTENSION_XML += res.xml
-if BUILD_RES
+if BUILD_RESOURCE
 lib_LTLIBRARIES += libxcb-res.la
 libxcb_res_la_LDFLAGS = -version-info 0:0:0
 libxcb_res_la_LIBADD = $(XCB_LIBS)
@@ -168,7 +163,7 @@ endif
 EXTHEADERS += xf86dri.h
 EXTSOURCES += xf86dri.c
 EXTENSION_XML += xf86dri.xml
-if BUILD_XF86DRI
+if BUILD_XFREE86_DRI
 lib_LTLIBRARIES += libxcb-xf86dri.la
 libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0
 libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
@@ -257,7 +252,7 @@ endif
 
 
 
-xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
+xcbinclude_HEADERS = xcb.h xcbext.h $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
 BUILT_SOURCES = $(EXTSOURCES) $(EXTHEADERS)