diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
| commit | e445df175688f07d599649591c990d432375c67e (patch) | |
| tree | fc2295b9683852cab5394a4f187ca0001c987e4a /X11/Makefile.in | |
| parent | cbeb9ffa0c58e5e9b012ea3eb17dbf192659627f (diff) | |
| parent | cd50a4bbac9375d3cd460bbdf88395f802609daf (diff) | |
| download | vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.gz vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.bz2 vcxsrv-e445df175688f07d599649591c990d432375c67e.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'X11/Makefile.in')
| -rw-r--r-- | X11/Makefile.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/X11/Makefile.in b/X11/Makefile.in index d98cb473f..d362a0626 100644 --- a/X11/Makefile.in +++ b/X11/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -76,7 +76,6 @@ am__remove_distdir = \ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ @@ -86,6 +85,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -140,6 +140,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -168,6 +169,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xprotodir = $(includedir)/X11 @@ -203,7 +205,7 @@ nodist_xproto_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xproto.pc -EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog +EXTRA_DIST = xproto.pc.in ChangeLog CLEANFILES = ChangeLog all: do-not-use-config.h Xfuncproto.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -330,7 +332,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -620,7 +622,7 @@ uninstall-am: uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \ .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. |