From 01df5d59e56a1b060568f8cad2e89f7eea22fc70 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 29 Aug 2011 08:51:20 +0200 Subject: xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29 aug 2011 --- libX11/Makefile.am | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) (limited to 'libX11/Makefile.am') diff --git a/libX11/Makefile.am b/libX11/Makefile.am index 7a0c871f0..39e4bd947 100644 --- a/libX11/Makefile.am +++ b/libX11/Makefile.am @@ -1,34 +1,35 @@ -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 x11-xcb.pc - -MAINTAINERCLEANFILES = ChangeLog INSTALL - -.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 +# Order: nls before specs +SUBDIRS=include $(ORDER) nls man specs + +ACLOCAL_AMFLAGS = -I m4 + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = x11.pc x11-xcb.pc + +MAINTAINERCLEANFILES = ChangeLog INSTALL + +.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 -- cgit v1.2.3