Long-overdue build system overhaul.

3 files changed, 40 insertions, 79 deletions

diff --git a/contrib/.cvsignore b/contrib/.cvsignore
index f3c7a7c5..282522db 100644
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -1 +1,2 @@
 Makefile
+Makefile.in
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 00000000..363e7928
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,39 @@
+# $Id$
+
+subdir = contrib
+
+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
+	sample.muttrc  sample.mailcap sample.muttrc-tlr \
+	colors.default colors.linux smime.rc \
+	ca-bundle.crt smime_keys_test.pl
+
+EXTRA_DIST = language.txt language50.txt  \
+	patch.slang-1.2.2.keypad.1	\
+	$(SAMPLES) \
+	iconv/README \
+	iconv/make.sh
+
+install-data-local:
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
+	for f in $(SAMPLES) ; do \
+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
+	done
+	for f in $(srcdir)/iconv/*.rc ; do					\
+		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
+	done
+
+uninstall-local:
+	for f in $(SAMPLES) ; do \
+		rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
+	done
+	-rm -rf $(DESTDIR)$(docdir)/samples/iconv
+	-rmdir $(DESTDIR)$(docdir)/samples
+	-rmdir $(DESTDIR)$(docdir)
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist-hook: Makefile $(DISTFILES)
+	mkdir -p $(distdir)/iconv
+	for file in $(srcdir)/iconv/*.rc ; do					\
+		ln $$file $(distdir)/iconv 2> /dev/null				\
+			|| cp -p $$file $(distdir)/iconv ;			\
+	done
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
deleted file mode 100644
index df234ba4..00000000
--- a/contrib/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id$
-
-SHELL = /bin/sh
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-datarootdir = @datarootdir@
-mandir = @mandir@
-srcdir = @srcdir@
-docdir = @docdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-INSTALL = @INSTALL@
-VPATH = @srcdir@
-@SET_MAKE@
-
-subdir = contrib
-
-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-	sample.muttrc  sample.mailcap sample.muttrc-tlr \
-	colors.default colors.linux smime.rc \
-	ca-bundle.crt smime_keys_test.pl
-
-DISTFILES = Makefile.in language.txt language50.txt  \
-	patch.slang-1.2.2.keypad.1	\
-	$(SAMPLES)
-
-ICONV_DISTFILES = README make.sh
-
-all clean:
-
-distclean:
-	-rm -f Makefile
-
-check:
-
-install:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-	for f in $(SAMPLES) ; do \
-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
-	done
-	for f in $(srcdir)/iconv/*.rc ; do					\
-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-	done
-
-uninstall:
-	for f in $(SAMPLES) ; do \
-		rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
-	done
-	-rm -rf $(DESTDIR)$(docdir)/samples/iconv
-	-rmdir $(DESTDIR)$(docdir)/samples
-	-rmdir $(DESTDIR)$(docdir)
-
-maintainer-clean: distclean
-
-Makefile: ../config.status Makefile.in
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
-	for file in $(DISTFILES) ; do				\
-		ln $(srcdir)/$$file $(distdir) 2> /dev/null 	\
-			|| cp -p $(srcdir)/$$file $(distdir); 	\
-	done
-	mkdir -p $(distdir)/iconv
-	for file in $(ICONV_DISTFILES) ; do					\
-		ln $(srcdir)/iconv/$$file $(distdir)/iconv 2> /dev/null 	\
-			|| cp -p $(srcdir)/iconv/$$file $(distdir)/iconv; 	\
-	done
-	for file in $(srcdir)/iconv/*.rc ; do					\
-		ln $$file $(distdir)/iconv 2> /dev/null				\
-			|| cp -p $$file $(distdir)/iconv ;			\
-	done