diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-02 17:38:11 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-02 17:38:11 +0000 |
| commit | fe234aa555e2b16ac7836fee297878a6e3efe343 (patch) | |
| tree | 0054fee4ccceedccb9c6a2e1b35574ffa538788a /xorg-server/Makefile.am | |
| parent | 54fffe7283b49dcaae81e826eb0dff213552c4ec (diff) | |
| parent | b65b8f8f5f9d2ffcf9dd6419f0c582d14986a9e0 (diff) | |
| download | vcxsrv-fe234aa555e2b16ac7836fee297878a6e3efe343.tar.gz vcxsrv-fe234aa555e2b16ac7836fee297878a6e3efe343.tar.bz2 vcxsrv-fe234aa555e2b16ac7836fee297878a6e3efe343.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/Makefile.am')
| -rw-r--r-- | xorg-server/Makefile.am | 192 |
1 files changed, 95 insertions, 97 deletions
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am index 8b7a2c8b4..1c522137d 100644 --- a/xorg-server/Makefile.am +++ b/xorg-server/Makefile.am @@ -1,97 +1,95 @@ -AUTOMAKE_OPTIONS=nostdinc -ACLOCAL_AMFLAGS = -I m4 - -if COMPOSITE -COMPOSITE_DIR=composite -endif - -if GLX -GLX_DIR=glx -endif - -if DBE -DBE_DIR=dbe -endif - -if RECORD -RECORD_DIR=record -endif - -SUBDIRS = \ - doc \ - include \ - dix \ - fb \ - mi \ - Xext \ - miext \ - os \ - randr \ - render \ - Xi \ - xkb \ - $(DBE_DIR) \ - $(RECORD_DIR) \ - xfixes \ - damageext \ - $(COMPOSITE_DIR) \ - $(GLX_DIR) \ - exa \ - config \ - hw \ - test - -if XORG -aclocaldir = $(datadir)/aclocal -aclocal_DATA = xorg-server.m4 - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xorg-server.pc -endif - -EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh - -DISTCHECK_CONFIGURE_FLAGS=\ - --with-xkb-path=$(XKB_BASE_DIRECTORY) \ - --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \ - --with-xkb-output='$${datadir}/X11/xkb/compiled' - -DISTCLEANFILES = doltcompile doltlibtool - -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) - -ChangeLog: - $(CHANGELOG_CMD) - -dist-hook: ChangeLog INSTALL - -DIST_SUBDIRS = \ - doc \ - include \ - dix \ - fb \ - mi \ - Xext \ - miext \ - os \ - randr \ - render \ - Xi \ - xkb \ - dbe \ - record \ - xfixes \ - damageext \ - composite \ - glx \ - exa \ - config \ - hw \ - test - -# gross hack -relink: all - $(AM_V_at)$(MAKE) -C hw relink +AUTOMAKE_OPTIONS=nostdinc
+ACLOCAL_AMFLAGS = -I m4
+
+if COMPOSITE
+COMPOSITE_DIR=composite
+endif
+
+if GLX
+GLX_DIR=glx
+endif
+
+if DBE
+DBE_DIR=dbe
+endif
+
+if RECORD
+RECORD_DIR=record
+endif
+
+SUBDIRS = \
+ doc \
+ include \
+ dix \
+ fb \
+ mi \
+ Xext \
+ miext \
+ os \
+ randr \
+ render \
+ Xi \
+ xkb \
+ $(DBE_DIR) \
+ $(RECORD_DIR) \
+ xfixes \
+ damageext \
+ $(COMPOSITE_DIR) \
+ $(GLX_DIR) \
+ exa \
+ config \
+ hw \
+ test
+
+if XORG
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = xorg-server.m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xorg-server.pc
+endif
+
+EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh
+
+DISTCHECK_CONFIGURE_FLAGS=\
+ --with-xkb-path=$(XKB_BASE_DIRECTORY) \
+ --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
+ --with-xkb-output='$${datadir}/X11/xkb/compiled'
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+DIST_SUBDIRS = \
+ doc \
+ include \
+ dix \
+ fb \
+ mi \
+ Xext \
+ miext \
+ os \
+ randr \
+ render \
+ Xi \
+ xkb \
+ dbe \
+ record \
+ xfixes \
+ damageext \
+ composite \
+ glx \
+ exa \
+ config \
+ hw \
+ test
+
+# gross hack
+relink: all
+ $(AM_V_at)$(MAKE) -C hw relink
|