aboutsummaryrefslogtreecommitdiff
path: root/libXpm/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-25 15:37:13 +0000
committermarha <marha@users.sourceforge.net>2011-03-25 15:37:13 +0000
commit41a502478a2972358dec934d82ee401c61a5cd36 (patch)
tree3fda8100e6da9b4a2863789e393016a750502067 /libXpm/Makefile.am
parent81aeaf653a832c4054d9a40b1cc796911521a739 (diff)
parent272e57235cd60a2e65ac8258d96a02eb3939b687 (diff)
downloadvcxsrv-41a502478a2972358dec934d82ee401c61a5cd36.tar.gz
vcxsrv-41a502478a2972358dec934d82ee401c61a5cd36.tar.bz2
vcxsrv-41a502478a2972358dec934d82ee401c61a5cd36.zip
svn merge ^/branches/released .
Diffstat (limited to 'libXpm/Makefile.am')
-rw-r--r--libXpm/Makefile.am50
1 files changed, 23 insertions, 27 deletions
diff --git a/libXpm/Makefile.am b/libXpm/Makefile.am
index d6e7b293c..738a79883 100644
--- a/libXpm/Makefile.am
+++ b/libXpm/Makefile.am
@@ -1,27 +1,23 @@
-# Daniel Stone disowns all copyright on this file; no warranty is given as to its
-# suitability or otherwise.
-
-SUBDIRS = src sxpm cxpm
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xpm.pc
-EXTRA_DIST = \
- xpm.pc.in \
- xpm.PS.gz \
- CHANGES \
- COPYRIGHT \
- FAQ.html \
- FILES \
- README.AMIGA \
- README.html \
- README.MSW
-
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-
-.PHONY: ChangeLog
-
-ChangeLog:
- $(CHANGELOG_CMD)
-
-dist-hook: ChangeLog
+# Daniel Stone disowns all copyright on this file; no warranty is given as to its
+# suitability or otherwise.
+
+SUBDIRS = doc include src sxpm cxpm
+
+ACLOCAL_AMFLAGS = -I m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xpm.pc
+
+EXTRA_DIST = COPYRIGHT NEWS.old
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL