diff options
author | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
commit | f707ea3ce065f0ce40f586c40283fab42059b485 (patch) | |
tree | 055a5ccdecaec105365d1de9a90d7d6b38f257fb /libxcb/src/Makefile.am | |
parent | c8483dc2831dc37d93a36804022f6b064f5962ea (diff) | |
parent | 09e94a8e392e8fe6fd89ddefbf3897a92e525b5b (diff) | |
download | vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.gz vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.bz2 vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Added presentproto-1.0
libxtrans libxcb xcb-proto mesa git update 8 nov 2013
Conflicts:
X11/xtrans/Xtransint.h
X11/xtrans/Xtranssock.c
libxcb/src/.gitignore
mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'libxcb/src/Makefile.am')
-rw-r--r-- | libxcb/src/Makefile.am | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/libxcb/src/Makefile.am b/libxcb/src/Makefile.am index 6b5a2c3c4..346ee03cc 100644 --- a/libxcb/src/Makefile.am +++ b/libxcb/src/Makefile.am @@ -56,6 +56,22 @@ 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 @@ -233,7 +249,7 @@ EXTRA_DIST = $(STATIC_MANS) BUILT_SOURCES = $(EXTSOURCES) $(BUILT_MANS) CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(BUILT_MANS) -$(EXTSOURCES): c_client.py +$(EXTSOURCES): c_client.py $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml) $(PYTHON) $(srcdir)/c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml) $(man_MANS): $(EXTSOURCES) |