X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=5a3c52abd33938c83b308abc8bb79d18c4837d4a;hb=a187ae85729ec56e46ed0a0453458db18ab731eb;hp=a176d86696c9b8b938ef9c3c2311d28371aa4932;hpb=4a405feba8cde8490d847a57b7e833176e18b90f;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/Makefile.am b/src/Makefile.am
index a176d86..5a3c52a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,22 +1,15 @@
-lib_LTLIBRARIES = libxcb.la \
-                  libxcb-xlib.la
+lib_LTLIBRARIES = libxcb.la
 
-EXTHEADERS =	xproto.h \
-		bigreq.h \
-		xc_misc.h
 EXTSOURCES =	xproto.c \
 		bigreq.c \
 		xc_misc.c
-EXTENSION_XML = xproto.xml \
-		bigreq.xml \
-		xc_misc.xml
 
-AM_CFLAGS = $(CWARNFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
+AM_CFLAGS = $(BASE_CFLAGS) $(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.py \
-		xproto.c bigreq.c xc_misc.c
+		xcb_list.c xcb_util.c xcb_auth.c c_client.py
+nodist_libxcb_la_SOURCES = xproto.c bigreq.c xc_misc.c
 
 # Explanation for -version-info:
 # -version-info current:revision:age
@@ -25,253 +18,239 @@ 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 -no-undefined @lt_enable_auto_import@
 
 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.
 
+EXTSOURCES += composite.c
 if BUILD_COMPOSITE
 lib_LTLIBRARIES += libxcb-composite.la
-EXTHEADERS += composite.h
-EXTSOURCES += composite.c
-EXTENSION_XML += composite.xml
-libxcb_composite_la_LDFLAGS = -version-info 0:0:0
+libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_composite_la_LIBADD = $(XCB_LIBS)
-libxcb_composite_la_SOURCES = composite.c composite.h
+nodist_libxcb_composite_la_SOURCES = composite.c composite.h
 endif
 
+EXTSOURCES += damage.c
 if BUILD_DAMAGE
 lib_LTLIBRARIES += libxcb-damage.la
-EXTHEADERS += damage.h
-EXTSOURCES += damage.c
-EXTENSION_XML += damage.xml
-libxcb_damage_la_LDFLAGS = -version-info 0:0:0
+libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_damage_la_LIBADD = $(XCB_LIBS)
-libxcb_damage_la_SOURCES = damage.c damage.h
+nodist_libxcb_damage_la_SOURCES = damage.c damage.h
 endif
 
+EXTSOURCES += dpms.c
 if BUILD_DPMS
 lib_LTLIBRARIES += libxcb-dpms.la
-EXTHEADERS += dpms.h
-EXTSOURCES += dpms.c
-EXTENSION_XML += dpms.xml
-libxcb_dpms_la_LDFLAGS = -version-info 0:0:0
+libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_dpms_la_LIBADD = $(XCB_LIBS)
-libxcb_dpms_la_SOURCES = dpms.c dpms.h
+nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h
 endif
 
+EXTSOURCES += dri2.c
+if BUILD_DRI2
+lib_LTLIBRARIES += libxcb-dri2.la
+libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_dri2_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h
+endif
+
+EXTSOURCES += dri3.c
+if BUILD_DRI3
+lib_LTLIBRARIES += libxcb-dri3.la
+libxcb_dri3_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_dri3_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_dri3_la_SOURCES = dri3.c dri3.h
+endif
+
+EXTSOURCES += present.c
+if BUILD_PRESENT
+lib_LTLIBRARIES += libxcb-present.la
+libxcb_present_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_present_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_present_la_SOURCES = present.c present.h
+endif
+
+EXTSOURCES += glx.c
 if BUILD_GLX
 lib_LTLIBRARIES += libxcb-glx.la
-EXTHEADERS += glx.h
-EXTSOURCES += glx.c
-EXTENSION_XML += glx.xml
-libxcb_glx_la_LDFLAGS = -version-info 0:0:0
+libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_glx_la_LIBADD = $(XCB_LIBS)
-libxcb_glx_la_SOURCES = glx.c glx.h
+nodist_libxcb_glx_la_SOURCES = glx.c glx.h
 endif
 
+EXTSOURCES += randr.c
 if BUILD_RANDR
 lib_LTLIBRARIES += libxcb-randr.la
-EXTHEADERS += randr.h
-EXTSOURCES += randr.c
-EXTENSION_XML += randr.xml
-libxcb_randr_la_LDFLAGS = -version-info 0:0:0
+libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
 libxcb_randr_la_LIBADD = $(XCB_LIBS)
-libxcb_randr_la_SOURCES = randr.c randr.h
+nodist_libxcb_randr_la_SOURCES = randr.c randr.h
 endif
 
+EXTSOURCES += record.c
 if BUILD_RECORD
 lib_LTLIBRARIES += libxcb-record.la
-EXTHEADERS += record.h
-EXTSOURCES += record.c
-EXTENSION_XML += record.xml
-libxcb_record_la_LDFLAGS = -version-info 0:0:0
+libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_record_la_LIBADD = $(XCB_LIBS)
-libxcb_record_la_SOURCES = record.c record.h
+nodist_libxcb_record_la_SOURCES = record.c record.h
 endif
 
+EXTSOURCES += render.c
 if BUILD_RENDER
 lib_LTLIBRARIES += libxcb-render.la
-EXTHEADERS += render.h
-EXTSOURCES += render.c
-EXTENSION_XML += render.xml
-libxcb_render_la_LDFLAGS = -version-info 0:0:0
+libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_render_la_LIBADD = $(XCB_LIBS)
-libxcb_render_la_SOURCES = render.c render.h
+nodist_libxcb_render_la_SOURCES = render.c render.h
 endif
 
-if BUILD_RES
-lib_LTLIBRARIES += libxcb-res.la
-EXTHEADERS += res.h
 EXTSOURCES += res.c
-EXTENSION_XML += res.xml
-libxcb_res_la_LDFLAGS = -version-info 0:0:0
+if BUILD_RESOURCE
+lib_LTLIBRARIES += libxcb-res.la
+libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_res_la_LIBADD = $(XCB_LIBS)
-libxcb_res_la_SOURCES = res.c res.h
+nodist_libxcb_res_la_SOURCES = res.c res.h
 endif
 
+EXTSOURCES += screensaver.c
 if BUILD_SCREENSAVER
 lib_LTLIBRARIES += libxcb-screensaver.la
-EXTHEADERS += screensaver.h
-EXTSOURCES += screensaver.c
-EXTENSION_XML += screensaver.xml
-libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0
+libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
-libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
+nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
 endif
 
+EXTSOURCES += shape.c
 if BUILD_SHAPE
 lib_LTLIBRARIES += libxcb-shape.la
-EXTHEADERS += shape.h
-EXTSOURCES += shape.c
-EXTENSION_XML += shape.xml
-libxcb_shape_la_LDFLAGS = -version-info 0:0:0
+libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_shape_la_LIBADD = $(XCB_LIBS)
-libxcb_shape_la_SOURCES = shape.c shape.h
+nodist_libxcb_shape_la_SOURCES = shape.c shape.h
 endif
 
+EXTSOURCES += shm.c
 if BUILD_SHM
 lib_LTLIBRARIES += libxcb-shm.la
-EXTHEADERS += shm.h
-EXTSOURCES += shm.c
-EXTENSION_XML += shm.xml
-libxcb_shm_la_LDFLAGS = -version-info 0:0:0
+libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_shm_la_LIBADD = $(XCB_LIBS)
-libxcb_shm_la_SOURCES = shm.c shm.h
+nodist_libxcb_shm_la_SOURCES = shm.c shm.h
 endif
 
+EXTSOURCES += sync.c
 if BUILD_SYNC
 lib_LTLIBRARIES += libxcb-sync.la
-EXTHEADERS += sync.h
-EXTSOURCES += sync.c
-EXTENSION_XML += sync.xml
-libxcb_sync_la_LDFLAGS = -version-info 0:0:0
+libxcb_sync_la_LDFLAGS = -version-info 1:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_sync_la_LIBADD = $(XCB_LIBS)
-libxcb_sync_la_SOURCES = sync.c sync.h
+nodist_libxcb_sync_la_SOURCES = sync.c sync.h
 endif
 
+EXTSOURCES += xevie.c
 if BUILD_XEVIE
 lib_LTLIBRARIES += libxcb-xevie.la
-EXTHEADERS += xevie.h
-EXTSOURCES += xevie.c
-EXTENSION_XML += xevie.xml
-libxcb_xevie_la_LDFLAGS = -version-info 0:0:0
+libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xevie_la_LIBADD = $(XCB_LIBS)
-libxcb_xevie_la_SOURCES = xevie.c xevie.h
+nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
 endif
 
-if BUILD_XF86DRI
-lib_LTLIBRARIES += libxcb-xf86dri.la
-EXTHEADERS += xf86dri.h
 EXTSOURCES += xf86dri.c
-EXTENSION_XML += xf86dri.xml
-libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0
+if BUILD_XFREE86_DRI
+lib_LTLIBRARIES += libxcb-xf86dri.la
+libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
-libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
+nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
 endif
 
+EXTSOURCES += xfixes.c
 if BUILD_XFIXES
 lib_LTLIBRARIES += libxcb-xfixes.la
-EXTHEADERS += xfixes.h
-EXTSOURCES += xfixes.c
-EXTENSION_XML += xfixes.xml
-libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0
+libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
-libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
+nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
 endif
 
+EXTSOURCES += xinerama.c
 if BUILD_XINERAMA
 lib_LTLIBRARIES += libxcb-xinerama.la
-EXTHEADERS += xinerama.h
-EXTSOURCES += xinerama.c
-EXTENSION_XML += xinerama.xml
-libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0
+libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
-libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
+nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
 endif
 
+EXTSOURCES += xinput.c
 if BUILD_XINPUT
 lib_LTLIBRARIES += libxcb-xinput.la
-EXTHEADERS += xinput.h
-EXTSOURCES += xinput.c
-EXTENSION_XML += xinput.xml
-libxcb_xinput_la_LDFLAGS = -version-info 0:0:0
+libxcb_xinput_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
 libxcb_xinput_la_LIBADD = $(XCB_LIBS)
-libxcb_xinput_la_SOURCES = xinput.c xinput.h
+nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
+endif
+
+EXTSOURCES += xkb.c
+if BUILD_XKB
+lib_LTLIBRARIES += libxcb-xkb.la
+libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libxcb_xkb_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h
 endif
 
+EXTSOURCES += xprint.c
 if BUILD_XPRINT
 lib_LTLIBRARIES += libxcb-xprint.la
-EXTHEADERS += xprint.h
-EXTSOURCES += xprint.c
-EXTENSION_XML += xprint.xml
-libxcb_xprint_la_LDFLAGS = -version-info 0:0:0
+libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xprint_la_LIBADD = $(XCB_LIBS)
-libxcb_xprint_la_SOURCES = xprint.c xprint.h
+nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
 endif
 
+EXTSOURCES += xselinux.c
 if BUILD_SELINUX
 lib_LTLIBRARIES += libxcb-xselinux.la
-EXTHEADERS += xselinux.h
-EXTSOURCES += xselinux.c
-EXTENSION_XML += xselinux.xml
-libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0
+libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
-libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
+nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
 endif
 
+EXTSOURCES += xtest.c
 if BUILD_XTEST
 lib_LTLIBRARIES += libxcb-xtest.la
-EXTHEADERS += xtest.h
-EXTSOURCES += xtest.c
-EXTENSION_XML += xtest.xml
-libxcb_xtest_la_LDFLAGS = -version-info 0:0:0
+libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xtest_la_LIBADD = $(XCB_LIBS)
-libxcb_xtest_la_SOURCES = xtest.c xtest.h
+nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
 endif
 
+EXTSOURCES += xv.c
 if BUILD_XV
 lib_LTLIBRARIES += libxcb-xv.la
-EXTHEADERS += xv.h
-EXTSOURCES += xv.c
-EXTENSION_XML += xv.xml
-libxcb_xv_la_LDFLAGS = -version-info 0:0:0
+libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xv_la_LIBADD = $(XCB_LIBS)
-libxcb_xv_la_SOURCES = xv.c xv.h
+nodist_libxcb_xv_la_SOURCES = xv.c xv.h
 endif
 
+EXTSOURCES += xvmc.c
 if BUILD_XVMC
 lib_LTLIBRARIES += libxcb-xvmc.la
-EXTHEADERS += xvmc.h
-EXTSOURCES += xvmc.c
-EXTENSION_XML += xvmc.xml
-libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0
+libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
 libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
-libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h
+nodist_libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h
 endif
 
 
-
-xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
+EXTHEADERS=$(EXTSOURCES:.c=.h)
+xcbinclude_HEADERS = xcb.h xcbext.h
+if XCB_HAVE_WIN32
+xcbinclude_HEADERS += xcb_windefs.h
+endif
+nodist_xcbinclude_HEADERS = $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
-BUILT_SOURCES = $(EXTSOURCES) $(EXTHEADERS)
-CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(EXTENSION_XML)
-
-$(EXTHEADERS) $(EXTSOURCES): c_client.py
-
-SUFFIXES = .xml
+BUILT_MAN_PAGES = man/xcb_*
+libmandir = $(LIB_MAN_DIR)
+libman_DATA = $(BUILT_MAN_PAGES)
 
-.xml.h:
-	$(PYTHON) c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $(XCBPROTO_XCBINCLUDEDIR)/$<
+BUILT_SOURCES = $(EXTSOURCES) $(BUILT_MAN_PAGES)
+CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(BUILT_MAN_PAGES)
 
-.xml.c:
-	$(PYTHON) c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $(XCBPROTO_XCBINCLUDEDIR)/$<
+$(EXTSOURCES): c_client.py $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml)
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/c_client.py	-c "$(PACKAGE_STRING)" -l "$(XORG_MAN_PAGE)" \
+		-s "$(LIB_MAN_SUFFIX)" -p $(XCBPROTO_XCBPYTHONDIR) \
+		$(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml)
 
-$(EXTENSION_XML):
-	$(LN_S) -f $(XCBPROTO_XCBINCLUDEDIR)/$@ $@
+$(BUILT_MAN_PAGES): $(EXTSOURCES)