X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=f48e14e97af07b4ee45ea6bc798a9cc4e262a5fa;hb=d04a4a03a90f2721d507287938c90f1755d9da0e;hp=0715708a687dd98703c75564c1807d2441746a9d;hpb=2538acd8c89d73e8c074849c63857cb899a29bbb;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/Makefile.am b/src/Makefile.am
index 0715708..f48e14e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,112 +1,15 @@
-lib_LTLIBRARIES = libXCB.la \
-                  libXCBcomposite.la \
-                  libXCBdamage.la \
-                  libXCBdpms.la \
-                  libXCBglx.la \
-                  libXCBrandr.la \
-                  libXCBrecord.la \
-                  libXCBrender.la \
-                  libXCBres.la \
-                  libXCBscreensaver.la \
-                  libXCBshape.la \
-                  libXCBshm.la \
-                  libXCBsync.la \
-                  libXCBxevie.la \
-                  libXCBxf86dri.la \
-                  libXCBxfixes.la \
-                  libXCBxprint.la \
-                  libXCBxtest.la \
-                  libXCBxv.la \
-                  libXCBxvmc.la
-
-EXTHEADERS = \
-		extensions/bigreq.h \
-		extensions/composite.h \
-		extensions/damage.h \
-		extensions/dpms.h \
-		extensions/glx.h \
-		extensions/randr.h \
-		extensions/record.h \
-		extensions/render.h \
-		extensions/res.h \
-		extensions/screensaver.h \
-		extensions/shape.h \
-		extensions/shm.h \
-		extensions/sync.h \
-		extensions/xc_misc.h \
-		extensions/xevie.h \
-		extensions/xf86dri.h \
-		extensions/xfixes.h \
-		extensions/xprint.h \
-		extensions/xtest.h \
-		extensions/xv.h \
-		extensions/xvmc.h
-EXTSOURCES = \
-		extensions/bigreq.c \
-		extensions/composite.c \
-		extensions/damage.c \
-		extensions/dpms.c \
-		extensions/glx.c \
-		extensions/randr.c \
-		extensions/record.c \
-		extensions/render.c \
-		extensions/res.c \
-		extensions/screensaver.c \
-		extensions/shape.c \
-		extensions/shm.c \
-		extensions/sync.c \
-		extensions/xc_misc.c \
-		extensions/xevie.c \
-		extensions/xf86dri.c \
-		extensions/xfixes.c \
-		extensions/xprint.c \
-		extensions/xtest.c \
-		extensions/xv.c \
-		extensions/xvmc.c
-EXTENSIONS = $(EXTSOURCES) $(EXTHEADERS)
-
-ESSENTIAL_EXTENSIONS = \
-		extensions/bigreq.h \
-		extensions/bigreq.c \
-		extensions/xc_misc.h \
-		extensions/xc_misc.c
-
-EXTENSION_XML = \
-		extensions/bigreq.xml \
-		extensions/composite.xml \
-		extensions/damage.xml \
-		extensions/dpms.xml \
-		extensions/glx.xml \
-		extensions/randr.xml \
-		extensions/record.xml \
-		extensions/render.xml \
-		extensions/res.xml \
-		extensions/screensaver.xml \
-		extensions/shape.xml \
-		extensions/shm.xml \
-		extensions/sync.xml \
-		extensions/xc_misc.xml \
-		extensions/xevie.xml \
-		extensions/xf86dri.xml \
-		extensions/xfixes.xml \
-		extensions/xprint.xml \
-		extensions/xtest.xml \
-		extensions/xvmc.xml \
-		extensions/xv.xml
-
-COREHEADERS = xproto.h
-CORESOURCES = xproto.c
-COREPROTO   = $(CORESOURCES) $(COREHEADERS)
-
-xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
-noinst_HEADERS = xcbint.h
+lib_LTLIBRARIES = libxcb.la
+
+EXTSOURCES =	xproto.c \
+		bigreq.c \
+		xc_misc.c
 
-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 = \
+AM_CFLAGS = $(CWARNFLAGS) $(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_xlib.c xcb_auth.c \
-		$(COREPROTO) $(ESSENTIAL_EXTENSIONS) c-client.xsl
+		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
@@ -115,117 +18,222 @@ 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 0:0:0
+libxcb_la_LDFLAGS = -version-info 2:0:1 -no-undefined @lt_enable_auto_import@
 
-BUILT_SOURCES = $(COREPROTO) $(EXTENSIONS)
-CLEANFILES = $(COREPROTO) $(EXTENSIONS)
-
-XCB_LIBS = libXCB.la
+XCB_LIBS = libxcb.la
 
 # FIXME: find a way to autogenerate this from the XML files.
 
-libXCBcomposite_la_LDFLAGS = -version-info 0:0:0
-libXCBcomposite_la_LIBADD = $(XCB_LIBS)
-libXCBcomposite_la_SOURCES = extensions/composite.c extensions/composite.h
-
-libXCBdamage_la_LDFLAGS = -version-info 0:0:0
-libXCBdamage_la_LIBADD = $(XCB_LIBS)
-libXCBdamage_la_SOURCES = extensions/damage.c extensions/damage.h
-
-libXCBdpms_la_LDFLAGS = -version-info 0:0:0
-libXCBdpms_la_LIBADD = $(XCB_LIBS)
-libXCBdpms_la_SOURCES = extensions/dpms.c extensions/dpms.h
-
-libXCBglx_la_LDFLAGS = -version-info 0:0:0
-libXCBglx_la_LIBADD = $(XCB_LIBS)
-libXCBglx_la_SOURCES = extensions/glx.c extensions/glx.h
-
-libXCBrandr_la_LDFLAGS = -version-info 0:0:0
-libXCBrandr_la_LIBADD = $(XCB_LIBS)
-libXCBrandr_la_SOURCES = extensions/randr.c extensions/randr.h
-
-libXCBrecord_la_LDFLAGS = -version-info 0:0:0
-libXCBrecord_la_LIBADD = $(XCB_LIBS)
-libXCBrecord_la_SOURCES = extensions/record.c extensions/record.h
-
-libXCBrender_la_LDFLAGS = -version-info 0:0:0
-libXCBrender_la_LIBADD = $(XCB_LIBS)
-libXCBrender_la_SOURCES = extensions/render.c extensions/render.h
-
-libXCBres_la_LDFLAGS = -version-info 0:0:0
-libXCBres_la_LIBADD = $(XCB_LIBS)
-libXCBres_la_SOURCES = extensions/res.c extensions/res.h
-
-libXCBscreensaver_la_LDFLAGS = -version-info 0:0:0
-libXCBscreensaver_la_LIBADD = $(XCB_LIBS)
-libXCBscreensaver_la_SOURCES = extensions/screensaver.c extensions/screensaver.h
-
-libXCBshape_la_LDFLAGS = -version-info 0:0:0
-libXCBshape_la_LIBADD = $(XCB_LIBS)
-libXCBshape_la_SOURCES = extensions/shape.c extensions/shape.h
-
-libXCBshm_la_LDFLAGS = -version-info 0:0:0
-libXCBshm_la_LIBADD = $(XCB_LIBS)
-libXCBshm_la_SOURCES = extensions/shm.c extensions/shm.h
-
-libXCBsync_la_LDFLAGS = -version-info 0:0:0
-libXCBsync_la_LIBADD = $(XCB_LIBS)
-libXCBsync_la_SOURCES = extensions/sync.c extensions/sync.h
-
-libXCBxevie_la_LDFLAGS = -version-info 0:0:0
-libXCBxevie_la_LIBADD = $(XCB_LIBS)
-libXCBxevie_la_SOURCES = extensions/xevie.c extensions/xevie.h
-
-libXCBxf86dri_la_LDFLAGS = -version-info 0:0:0
-libXCBxf86dri_la_LIBADD = $(XCB_LIBS)
-libXCBxf86dri_la_SOURCES = extensions/xf86dri.c extensions/xf86dri.h
-
-libXCBxfixes_la_LDFLAGS = -version-info 0:0:0
-libXCBxfixes_la_LIBADD = $(XCB_LIBS)
-libXCBxfixes_la_SOURCES = extensions/xfixes.c extensions/xfixes.h
-
-libXCBxprint_la_LDFLAGS = -version-info 0:0:0
-libXCBxprint_la_LIBADD = $(XCB_LIBS)
-libXCBxprint_la_SOURCES = extensions/xprint.c extensions/xprint.h
-
-libXCBxtest_la_LDFLAGS = -version-info 0:0:0
-libXCBxtest_la_LIBADD = $(XCB_LIBS)
-libXCBxtest_la_SOURCES = extensions/xtest.c extensions/xtest.h
-
-libXCBxv_la_LDFLAGS = -version-info 0:0:0
-libXCBxv_la_LIBADD = $(XCB_LIBS)
-libXCBxv_la_SOURCES = extensions/xv.c extensions/xv.h
-
-libXCBxvmc_la_LDFLAGS = -version-info 0:0:0
-libXCBxvmc_la_LIBADD = $(XCB_LIBS)
-libXCBxvmc_la_SOURCES = extensions/xvmc.c extensions/xvmc.h
-
-$(EXTHEADERS) $(EXTSOURCES): c-client.xsl
-
-SUFFIXES = .xml
-
-.xml.h:
-	@n=`dirname $*`; test -d $$n || (echo mkdir $$n; mkdir $$n)
-	$(XSLTPROC) --stringparam mode header \
-	            --stringparam base-path $(XCBPROTO_XCBINCLUDEDIR)/ \
-	            --stringparam extension-path \
-	                          $(XCBPROTO_XCBINCLUDEDIR)/extensions/ \
-	            -o $@ $(srcdir)/c-client.xsl $< 
-
-.xml.c:
-	@n=`dirname $*`; test -d $$n || (echo mkdir $$n; mkdir $$n)
-	$(XSLTPROC) --stringparam mode source \
-	            --stringparam base-path $(XCBPROTO_XCBINCLUDEDIR)/ \
-	            --stringparam extension-path \
-	                          $(XCBPROTO_XCBINCLUDEDIR)/extensions/ \
-	            -o $@ $(srcdir)/c-client.xsl $< 
-
-xproto.xml: $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml
-	$(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml $@
-
-$(EXTENSION_XML):
-	[ -d extensions ] || mkdir extensions
-	for i in $(EXTENSION_XML) ; do \
-           rm -f $$i ; \
-           $(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/$$i $$i ; \
-        done
+EXTSOURCES += composite.c
+if BUILD_COMPOSITE
+lib_LTLIBRARIES += libxcb-composite.la
+libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_composite_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_composite_la_SOURCES = composite.c composite.h
+endif
+
+EXTSOURCES += damage.c
+if BUILD_DAMAGE
+lib_LTLIBRARIES += libxcb-damage.la
+libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_damage_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_damage_la_SOURCES = damage.c damage.h
+endif
+
+EXTSOURCES += dpms.c
+if BUILD_DPMS
+lib_LTLIBRARIES += libxcb-dpms.la
+libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_dpms_la_LIBADD = $(XCB_LIBS)
+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 += glx.c
+if BUILD_GLX
+lib_LTLIBRARIES += libxcb-glx.la
+libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_glx_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_glx_la_SOURCES = glx.c glx.h
+endif
+
+EXTSOURCES += randr.c
+if BUILD_RANDR
+lib_LTLIBRARIES += libxcb-randr.la
+libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
+libxcb_randr_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_randr_la_SOURCES = randr.c randr.h
+endif
+
+EXTSOURCES += record.c
+if BUILD_RECORD
+lib_LTLIBRARIES += libxcb-record.la
+libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_record_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_record_la_SOURCES = record.c record.h
+endif
+
+EXTSOURCES += render.c
+if BUILD_RENDER
+lib_LTLIBRARIES += libxcb-render.la
+libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_render_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_render_la_SOURCES = render.c render.h
+endif
+
+EXTSOURCES += res.c
+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)
+nodist_libxcb_res_la_SOURCES = res.c res.h
+endif
+
+EXTSOURCES += screensaver.c
+if BUILD_SCREENSAVER
+lib_LTLIBRARIES += libxcb-screensaver.la
+libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
+endif
+
+EXTSOURCES += shape.c
+if BUILD_SHAPE
+lib_LTLIBRARIES += libxcb-shape.la
+libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_shape_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_shape_la_SOURCES = shape.c shape.h
+endif
+
+EXTSOURCES += shm.c
+if BUILD_SHM
+lib_LTLIBRARIES += libxcb-shm.la
+libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_shm_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_shm_la_SOURCES = shm.c shm.h
+endif
+
+EXTSOURCES += sync.c
+if BUILD_SYNC
+lib_LTLIBRARIES += libxcb-sync.la
+libxcb_sync_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_sync_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_sync_la_SOURCES = sync.c sync.h
+endif
+
+EXTSOURCES += xevie.c
+if BUILD_XEVIE
+lib_LTLIBRARIES += libxcb-xevie.la
+libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xevie_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
+endif
+
+EXTSOURCES += xf86dri.c
+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)
+nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
+endif
+
+EXTSOURCES += xfixes.c
+if BUILD_XFIXES
+lib_LTLIBRARIES += libxcb-xfixes.la
+libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
+endif
+
+EXTSOURCES += xinerama.c
+if BUILD_XINERAMA
+lib_LTLIBRARIES += libxcb-xinerama.la
+libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
+endif
+
+EXTSOURCES += xinput.c
+if BUILD_XINPUT
+lib_LTLIBRARIES += libxcb-xinput.la
+libxcb_xinput_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xinput_la_LIBADD = $(XCB_LIBS)
+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 0: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
+libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xprint_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
+endif
+
+EXTSOURCES += xselinux.c
+if BUILD_SELINUX
+lib_LTLIBRARIES += libxcb-xselinux.la
+libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
+endif
+
+EXTSOURCES += xtest.c
+if BUILD_XTEST
+lib_LTLIBRARIES += libxcb-xtest.la
+libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xtest_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
+endif
+
+EXTSOURCES += xv.c
+if BUILD_XV
+lib_LTLIBRARIES += libxcb-xv.la
+libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xv_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xv_la_SOURCES = xv.c xv.h
+endif
+
+EXTSOURCES += xvmc.c
+if BUILD_XVMC
+lib_LTLIBRARIES += libxcb-xvmc.la
+libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h
+endif
+
+
+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
+
+STATIC_MANS = man/xcb-examples.3 man/xcb-requests.3
+BUILT_MANS = man/xcb_*.3
+man_MANS = $(STATIC_MANS) $(BUILT_MANS)
+EXTRA_DIST = $(STATIC_MANS)
+
+BUILT_SOURCES = $(EXTSOURCES) $(BUILT_MANS)
+CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(BUILT_MANS)
+
+$(EXTSOURCES): c_client.py $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml)
+	$(PYTHON) $(srcdir)/c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml)
+
+$(man_MANS): $(EXTSOURCES)