diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-08 14:29:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-08 14:50:37 +0200 |
| commit | 72ec0e3bb2d7fc6b77b2a75873792f781679da6a (patch) | |
| tree | 0a736ab9a8c26276929ab077dc661e3625b54884 /libxcb/Makefile.am | |
| parent | 5e865910f0ce672295bd60460631339be5e311a0 (diff) | |
| parent | 990bc3f015a4f8fce2eb918375defcd44980a845 (diff) | |
| download | vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.gz vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.bz2 vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/.gitignore
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/Window.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libxcb/src/.gitignore
libxcb/src/xcb_ext.c
libxcb/src/xcb_xid.c
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mapi/glapi/glapi_getproc.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/program/.gitignore
xkbcomp/listing.c
xkbcomp/xkbpath.c
xorg-server/.gitignore
xorg-server/Xext/xvmain.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/hw/xwin/winprefsyacc.y
xorg-server/hw/xwin/winscrinit.c
xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
xorg-server/xkeyboard-config/rules/bin/ml_s.sh
xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'libxcb/Makefile.am')
| -rw-r--r-- | libxcb/Makefile.am | 170 |
1 files changed, 85 insertions, 85 deletions
diff --git a/libxcb/Makefile.am b/libxcb/Makefile.am index 6c43c5bd4..1f88b72da 100644 --- a/libxcb/Makefile.am +++ b/libxcb/Makefile.am @@ -1,85 +1,85 @@ -SUBDIRS=src tests doc
-
-pkgconfigdir = $(libdir)/pkgconfig
-
-pkgconfig_DATA = xcb.pc
-
-if BUILD_COMPOSITE
-pkgconfig_DATA += xcb-composite.pc
-endif
-if BUILD_DAMAGE
-pkgconfig_DATA += xcb-damage.pc
-endif
-if BUILD_DPMS
-pkgconfig_DATA += xcb-dpms.pc
-endif
-if BUILD_DRI2
-pkgconfig_DATA += xcb-dri2.pc
-endif
-if BUILD_GLX
-pkgconfig_DATA += xcb-glx.pc
-endif
-if BUILD_RANDR
-pkgconfig_DATA += xcb-randr.pc
-endif
-if BUILD_RECORD
-pkgconfig_DATA += xcb-record.pc
-endif
-if BUILD_RENDER
-pkgconfig_DATA += xcb-render.pc
-endif
-if BUILD_RESOURCE
-pkgconfig_DATA += xcb-res.pc
-endif
-if BUILD_SCREENSAVER
-pkgconfig_DATA += xcb-screensaver.pc
-endif
-if BUILD_SHAPE
-pkgconfig_DATA += xcb-shape.pc
-endif
-if BUILD_SHM
-pkgconfig_DATA += xcb-shm.pc
-endif
-if BUILD_SYNC
-pkgconfig_DATA += xcb-sync.pc
-endif
-if BUILD_XEVIE
-pkgconfig_DATA += xcb-xevie.pc
-endif
-if BUILD_XFREE86_DRI
-pkgconfig_DATA += xcb-xf86dri.pc
-endif
-if BUILD_XFIXES
-pkgconfig_DATA += xcb-xfixes.pc
-endif
-if BUILD_XINERAMA
-pkgconfig_DATA += xcb-xinerama.pc
-endif
-if BUILD_XINPUT
-pkgconfig_DATA += xcb-xinput.pc
-endif
-if BUILD_XKB
-pkgconfig_DATA += xcb-xkb.pc
-endif
-if BUILD_XPRINT
-pkgconfig_DATA += xcb-xprint.pc
-endif
-if BUILD_SELINUX
-pkgconfig_DATA += xcb-xselinux.pc
-endif
-if BUILD_XTEST
-pkgconfig_DATA += xcb-xtest.pc
-endif
-if BUILD_XV
-pkgconfig_DATA += xcb-xv.pc
-endif
-if BUILD_XVMC
-pkgconfig_DATA += xcb-xvmc.pc
-endif
-
-
-EXTRA_DIST = \
-tools/README \
-tools/api_conv.pl \
-tools/constants \
-autogen.sh
+SUBDIRS=src tests doc + +pkgconfigdir = $(libdir)/pkgconfig + +pkgconfig_DATA = xcb.pc + +if BUILD_COMPOSITE +pkgconfig_DATA += xcb-composite.pc +endif +if BUILD_DAMAGE +pkgconfig_DATA += xcb-damage.pc +endif +if BUILD_DPMS +pkgconfig_DATA += xcb-dpms.pc +endif +if BUILD_DRI2 +pkgconfig_DATA += xcb-dri2.pc +endif +if BUILD_GLX +pkgconfig_DATA += xcb-glx.pc +endif +if BUILD_RANDR +pkgconfig_DATA += xcb-randr.pc +endif +if BUILD_RECORD +pkgconfig_DATA += xcb-record.pc +endif +if BUILD_RENDER +pkgconfig_DATA += xcb-render.pc +endif +if BUILD_RESOURCE +pkgconfig_DATA += xcb-res.pc +endif +if BUILD_SCREENSAVER +pkgconfig_DATA += xcb-screensaver.pc +endif +if BUILD_SHAPE +pkgconfig_DATA += xcb-shape.pc +endif +if BUILD_SHM +pkgconfig_DATA += xcb-shm.pc +endif +if BUILD_SYNC +pkgconfig_DATA += xcb-sync.pc +endif +if BUILD_XEVIE +pkgconfig_DATA += xcb-xevie.pc +endif +if BUILD_XFREE86_DRI +pkgconfig_DATA += xcb-xf86dri.pc +endif +if BUILD_XFIXES +pkgconfig_DATA += xcb-xfixes.pc +endif +if BUILD_XINERAMA +pkgconfig_DATA += xcb-xinerama.pc +endif +if BUILD_XINPUT +pkgconfig_DATA += xcb-xinput.pc +endif +if BUILD_XKB +pkgconfig_DATA += xcb-xkb.pc +endif +if BUILD_XPRINT +pkgconfig_DATA += xcb-xprint.pc +endif +if BUILD_SELINUX +pkgconfig_DATA += xcb-xselinux.pc +endif +if BUILD_XTEST +pkgconfig_DATA += xcb-xtest.pc +endif +if BUILD_XV +pkgconfig_DATA += xcb-xv.pc +endif +if BUILD_XVMC +pkgconfig_DATA += xcb-xvmc.pc +endif + + +EXTRA_DIST = \ +tools/README \ +tools/api_conv.pl \ +tools/constants \ +autogen.sh |