diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-16 08:06:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-16 08:06:12 +0000 |
| commit | 08cbf3b50bfe713044f36b363c73768cd042f13c (patch) | |
| tree | 6be4c5dd7f5bc2f058228b2a2fa747a4d7666dc5 /xorg-server/Makefile.am | |
| parent | d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52 (diff) | |
| download | vcxsrv-08cbf3b50bfe713044f36b363c73768cd042f13c.tar.gz vcxsrv-08cbf3b50bfe713044f36b363c73768cd042f13c.tar.bz2 vcxsrv-08cbf3b50bfe713044f36b363c73768cd042f13c.zip | |
xserver xkeyboar-config mesa git update 16 May 2011
Diffstat (limited to 'xorg-server/Makefile.am')
| -rw-r--r-- | xorg-server/Makefile.am | 192 |
1 files changed, 97 insertions, 95 deletions
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am index 1c522137d..cea140bea 100644 --- a/xorg-server/Makefile.am +++ b/xorg-server/Makefile.am @@ -1,95 +1,97 @@ -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
+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 \ + man \ + 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 \ + man \ + 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 |