From 72bf88ed120fb888c57ed3223faa316403031b36 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Wed, 5 Oct 2005 20:24:14 +0000
Subject: Add missing files to EXTRA_DIST Fix man page installation

---
 ChangeLog        | 10 ++++++++++
 Makefile.am      | 17 +++++++++++++----
 cxpm/Makefile.am |  6 ++----
 src/Makefile.am  |  5 +++--
 sxpm/Makefile.am | 14 +++++++-------
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44d3f34..e7e83fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* Makefile.am:
+	* src/Makefile.am:
+	Add missing files to EXTRA_DIST
+
+	* cxpm/Makefile.am:
+	* sxpm/Makefile.am:
+	Fix man page installation
+
 2005-07-08  Keith Packard  <keithp@keithp.com>
 
 	* .cvsignore:
diff --git a/Makefile.am b/Makefile.am
index 715a05b..2a9ca64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,17 @@
 # Daniel Stone disowns all copyright on this file; no warranty is given as to its
 # suitability or otherwise.
 
-SUBDIRS=src sxpm cxpm
+SUBDIRS = src sxpm cxpm
 
-pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=xpm.pc
-EXTRA_DIST=xpm.pc.in xpm.PS.gz COPYRIGHT FAQ.html FILES README.AMIGA README.html README.MSW 
+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
diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am
index 61bd3fa..0abf869 100644
--- a/cxpm/Makefile.am
+++ b/cxpm/Makefile.am
@@ -2,8 +2,6 @@ bin_PROGRAMS = cxpm
 
 cxpm_CFLAGS = $(XPM_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/include/X11
 
-cxpm_MANS =			\
-	cxpm.1
+dist_man_MANS = cxpm.1
 
-cxpm_SOURCES =			\
-	cxpm.c
+cxpm_SOURCES = cxpm.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 0bc2249..2329daf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,8 +39,9 @@ libXpm_la_SOURCES =					\
 	parse.c						\
 	rgb.c						\
 	rgbtab.h					\
-	scan.c						\
-	simx.h
+	scan.c
 
 libXpmincludedir = $(includedir)/X11
 libXpminclude_HEADERS = $(top_srcdir)/include/X11/xpm.h
+
+EXTRA_DIST = amigax.c amigax.h simx.c simx.h
diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am
index 27ecc95..0e4e570 100644
--- a/sxpm/Makefile.am
+++ b/sxpm/Makefile.am
@@ -6,15 +6,15 @@ sxpm_CFLAGS = $(SXPM_CFLAGS)
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
 
-sxpm_MANS =			\
-	sxpm.1
+dist_man_MANS = sxpm.1
 
-sxpm_SOURCES =			\
-	sxpm.c			\
-	plaid_ext.xpm		\
-	plaid_mask.xpm		\
-	plaid.xpm
+sxpm_SOURCES = sxpm.c
 
 sxpm_LDADD = $(XPM_LIBS) $(SXPM_LIBS) $(top_builddir)/src/libXpm.la
 
 endif
+
+EXTRA_DIST = \
+	plaid_ext.xpm \
+	plaid_mask.xpm \
+	plaid.xpm
-- 
cgit v1.2.3