Remove cvs2cl up to top level, remove unnecessary cleanup rules and

intlclean script. No more conf directory.

4 files changed, 1 insertions, 41 deletions

diff --git a/Makefile.am.in b/Makefile.am.in
index 4a6422f..0519ab6 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -12,27 +12,13 @@ AUTOMAKE_OPTIONS = foreign
 
 TMPDEST=
 
-#
-# remove all intermediate files that can be recreated using
-# Makefile.cvs
-#
-maintainer-clean-local:
-	rm -f configure aclocal.m4 Makefile.in libtool \
-	Makefile.am configure.in \
-	conf/config.guess conf/config.sub conf/install-sh conf/ltconfig \
-	conf/ltmain.sh conf/missing conf/mkinstalldirs \
-	etc/*.spec ABOUT-NLS
-	find . -name "*~" -exec rm -f {} \;
-	find . -name "\.\#*" -exec rm -f {} \;
-	sh conf/intlclean
-
 install-data-local:
 	test "$(initdir)" != "none" && \
 		install -m 755 etc/psion $(DESTDIR)$(initdir)/psion || :
 
 dist-hook:
 	$(MAKE) TMPDEST=$(distdir)/ kdoc specfile
-	test -f CVS/Root && conf/cvs2cl -W 1800 -S --no-wrap --prune \
+	test -f CVS/Root && cvs2cl -W 1800 -S --no-wrap --prune \
 		--gmt -f $(distdir)/ChangeLog || \
 		cp -f ChangeLog $(distdir)/ChangeLog
 	rm -rf $(distdir)/debian/CVS
diff --git a/conf/.cvsignore b/conf/.cvsignore
deleted file mode 100644
index f2a407a..0000000
--- a/conf/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-missing
-mkinstalldirs
-ltconfig
-ltmain.sh
-install-sh
-config.guess
-config.sub
-config.rpath
diff --git a/conf/intlclean b/conf/intlclean
deleted file mode 100644
index 6d08e9a..0000000
--- a/conf/intlclean
+++ /dev/null
@@ -1,18 +0,0 @@
-cat<<EOF>po/Makefile
-maintainer-clean:
-	rm -f \
-	Make*.in boldquot.sed en@boldquot.header \
-	en@quot.header insert-header.sin Makevars.template \
-	quot.sed remove-potcdate.sin Rules-quot Makefile Makevars
-EOF
-cat<<EOF>intl/Makefile
-maintainer-clean:
-	cd .. && rm -rf intl
-
-EOF
-test -d m4 && cat<<EOF>m4/Makefile
-maintainer-clean:
-	cd .. && rm -rf m4
-
-EOF
-exit 0
diff --git a/conf/cvs2cl b/cvs2cl
index 58ec6eb..58ec6eb 100755
--- a/conf/cvs2cl
+++ b/cvs2cl