aboutsummaryrefslogtreecommitdiff
path: root/libX11/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-19 09:25:26 +0000
committermarha <marha@users.sourceforge.net>2010-05-19 09:25:26 +0000
commit153f5cafa19da4e4c0cf21e9c909958359ed8ebd (patch)
treeafb02018d05d75ebc99738b71bd315bdd58fb9b2 /libX11/Makefile.am
parent044f55eb2a3827716a6798f8d6226e6ea94032fd (diff)
downloadvcxsrv-153f5cafa19da4e4c0cf21e9c909958359ed8ebd.tar.gz
vcxsrv-153f5cafa19da4e4c0cf21e9c909958359ed8ebd.tar.bz2
vcxsrv-153f5cafa19da4e4c0cf21e9c909958359ed8ebd.zip
libX11 git update 19/10/2010
Diffstat (limited to 'libX11/Makefile.am')
-rw-r--r--libX11/Makefile.am76
1 files changed, 38 insertions, 38 deletions
diff --git a/libX11/Makefile.am b/libX11/Makefile.am
index 6e0feac87..b3d8cf5c4 100644
--- a/libX11/Makefile.am
+++ b/libX11/Makefile.am
@@ -1,38 +1,38 @@
-if XLIB_LOADABLE_I18N
-ORDER=src modules
-else
-ORDER=modules src
-endif
-SUBDIRS=include $(ORDER) nls man specs
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = x11.pc
-if XCB
-pkgconfig_DATA += x11-xcb.pc
-endif
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST=x11.pc.in x11-xcb.pc.in
-
-DISTCLEANFILES = doltcompile doltlibtool
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
- $(INSTALL_CMD)
-
-ChangeLog:
- $(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
-
-if LINT
-# Check source code with tools like lint & sparse
-LINT_SUBDIRS=src # modules
-
-lint:
- @for subdir in $(LINT_SUBDIRS) ; do \
- echo "Making $@ in $$subdir"; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
- done
-endif LINT
+if XLIB_LOADABLE_I18N
+ORDER=src modules
+else
+ORDER=modules src
+endif
+SUBDIRS=include $(ORDER) nls man specs
+
+ACLOCAL_AMFLAGS = -I m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = x11.pc
+if XCB
+pkgconfig_DATA += x11-xcb.pc
+endif
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+DISTCLEANFILES = doltcompile doltlibtool
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+if LINT
+# Check source code with tools like lint & sparse
+LINT_SUBDIRS=src # modules
+
+lint:
+ @for subdir in $(LINT_SUBDIRS) ; do \
+ echo "Making $@ in $$subdir"; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
+ done
+endif LINT