From a4a8c19bb3389548d641a0874a77c77f623ad7a5 Mon Sep 17 00:00:00 2001 From: Ales Hvezda Date: Fri, 7 Aug 2009 23:02:01 -0400 Subject: [PATCH] Makefile.am cleanup (removal of ChangeLog and Makefile.in files) Details on this commit: * Now that we are no longer storing machine generated ChangeLogs inside the git repository, make maintainer-clean should remove the machine generated ChangeLogs. This way nobody accidently edits the ChangeLog. Only 7 ChangeLogs are left after a make maintainer-clean (intl, po, and one toplevel ChangeLog). * Some directories were missing the removal of Makefile.in when make maintainer-clean is run. Only 3 Makefile.in files remain now after make maintainer-clean (only in the intl directories). * Removed $Id$ tags from some of the Makefiles since we are no longer using CVS. * Removed some unnecessary ChangeLogs from ever being created (from example/gTAG gschem/scripts, and symbol/font). Note 1: There are still some machine generated files still hanging around, but I'm going to leave those alone for now as the .gitignore mechanism properly masks those. Note 2: Made sure that all files that are to be removed in the *CLEANFILES lists comes before the #*# otherwise they will be ignored. --- docs/Makefile.am | 2 +- docs/wiki/lib/tpl/geda/Makefile.am | 1 + examples/Makefile.am | 2 +- examples/gTAG/Makefile.am | 7 +------ gattrib/Makefile.am | 2 +- gattrib/src/Makefile.am | 2 +- gnetlist/Makefile.am | 2 +- gnetlist/examples/vams/Makefile.am | 6 ++++++ gnetlist/tests/common/Makefile.am | 7 ++++++- gschem/Makefile.am | 2 +- gschem/scripts/Makefile.am | 9 ++------- gsymcheck/Makefile.am | 2 +- libgeda/Makefile.am | 2 +- libgeda/share/Makefile.am | 6 ++++++ symbols/Makefile.am | 7 ++----- utils/Makefile.am | 2 +- utils/tests/Makefile.am | 7 +++++-- utils/tests/gxyrs/Makefile.am | 6 ++++-- utils/tests/gxyrs/inputs/Makefile.am | 7 +++++-- utils/tests/gxyrs/outputs/Makefile.am | 7 +++++-- utils/tests/refdes_renum/Makefile.am | 8 +++++--- utils/tests/refdes_renum/inputs/Makefile.am | 7 +++++-- utils/tests/refdes_renum/outputs/Makefile.am | 7 +++++-- 23 files changed, 67 insertions(+), 43 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 6ff029ed0..9e295f735 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -11,4 +11,4 @@ endif HAVE_GIT_REPO MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog diff --git a/docs/wiki/lib/tpl/geda/Makefile.am b/docs/wiki/lib/tpl/geda/Makefile.am index 2faf00385..ba35770fb 100644 --- a/docs/wiki/lib/tpl/geda/Makefile.am +++ b/docs/wiki/lib/tpl/geda/Makefile.am @@ -5,4 +5,5 @@ docsdir = $(docdir)/$(docname)/lib/tpl/geda SUBDIRS = images +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in diff --git a/examples/Makefile.am b/examples/Makefile.am index 39a1e8310..1d88620a1 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -15,4 +15,4 @@ endif HAVE_GIT_REPO MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog diff --git a/examples/gTAG/Makefile.am b/examples/gTAG/Makefile.am index 8dd726f78..bb2849f42 100644 --- a/examples/gTAG/Makefile.am +++ b/examples/gTAG/Makefile.am @@ -8,12 +8,7 @@ example_DATA = 7414-1.sym attribs gafrc copyleft.sym crdist.sh \ gTAG.bom gTAG.ps gTAG.sch gnetlistrc max882.sym sn75240pw.sym \ README -EXTRA_DIST = ChangeLog ChangeLog-1.0 $(example_DATA) - -if HAVE_GIT_REPO -ChangeLog: $(top_builddir)/stamp-git - (cd $(srcdir) && $(GIT) log --pretty=medium $(CHANGELOG_BASE).. -- .) > $@ -endif HAVE_GIT_REPO +EXTRA_DIST = ChangeLog-1.0 $(example_DATA) MOSTLYCLEANFILES = gschem.log *~ CLEANFILES = gschem.log *~ diff --git a/gattrib/Makefile.am b/gattrib/Makefile.am index 93cb30cbf..f5ec41a5f 100644 --- a/gattrib/Makefile.am +++ b/gattrib/Makefile.am @@ -11,4 +11,4 @@ endif HAVE_GIT_REPO MOSTLYCLEANFILES = *.log core FILE *~ #*# CLEANFILES = *.log core FILE *~ #*# DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in #*# +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog #*# diff --git a/gattrib/src/Makefile.am b/gattrib/src/Makefile.am index 509a0aeae..d5c368d23 100644 --- a/gattrib/src/Makefile.am +++ b/gattrib/src/Makefile.am @@ -43,4 +43,4 @@ gattrib_LDADD = $(top_builddir)/libgeda/src/libgeda.la MOSTLYCLEANFILES = *.log *.ps core FILE *~ #*# CLEANFILES = *.log *.ps core FILE *~ #*# DISTCLEANFILES = *.log core FILE *~ #*# -MAINTAINERCLEANFILES = *.log *.ps core FILE *~ #*# +MAINTAINERCLEANFILES = *.log *.ps core FILE *~ Makefile.in #*# diff --git a/gnetlist/Makefile.am b/gnetlist/Makefile.am index f486cf1cd..fd51eb898 100644 --- a/gnetlist/Makefile.am +++ b/gnetlist/Makefile.am @@ -11,4 +11,4 @@ endif HAVE_GIT_REPO MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog diff --git a/gnetlist/examples/vams/Makefile.am b/gnetlist/examples/vams/Makefile.am index 540252b53..1dba54b3c 100644 --- a/gnetlist/examples/vams/Makefile.am +++ b/gnetlist/examples/vams/Makefile.am @@ -21,3 +21,9 @@ SUBDIRS = vhdl EXTRA_DIST = README commonrc gnetlistrc gschemrc gschemrc.orig \ $(sch_files) $(sym_files) + +MOSTLYCLEANFILES = core *.log FILE *.ps *~ +CLEANFILES = core *.log FILE *.ps *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = core *.log FILE *.ps *~ Makefile.in + diff --git a/gnetlist/tests/common/Makefile.am b/gnetlist/tests/common/Makefile.am index cb6234b86..c1380967e 100644 --- a/gnetlist/tests/common/Makefile.am +++ b/gnetlist/tests/common/Makefile.am @@ -28,7 +28,6 @@ TESTS= ${RUN_TESTS} EXTRA_DIST= run_backend_tests.sh ${RUN_TESTS} tests.list backends.list \ always-copy.list $(input_files) -CLEANFILES= *.log dist-hook: tests.list backends.list @tests=`cat $(srcdir)/tests.list | sed -e "s:#.*$$::" | sed -e "s:|.*$$::"`; \ @@ -43,3 +42,9 @@ dist-hook: tests.list backends.list $(distdir)/$$dir || exit $$?; \ done; \ done; + +MOSTLYCLEANFILES = core *.log FILE *.ps *~ +CLEANFILES = core *.log FILE *.ps *~ +DISTCLEANFILES = core *.log FILE *.ps *~ +MAINTAINERCLEANFILES = core *.log FILE *.ps *~ Makefile.in + diff --git a/gschem/Makefile.am b/gschem/Makefile.am index f18bcfaed..c371af87c 100644 --- a/gschem/Makefile.am +++ b/gschem/Makefile.am @@ -15,4 +15,4 @@ maintainer-clean-local: MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog diff --git a/gschem/scripts/Makefile.am b/gschem/scripts/Makefile.am index ab4b3e45a..8c2c7a11a 100644 --- a/gschem/scripts/Makefile.am +++ b/gschem/scripts/Makefile.am @@ -2,14 +2,9 @@ scmdatadir = $(GEDADATADIR)/scheme scmdata_DATA = image.scm print.scm bin_SCRIPTS = gschemdoc -EXTRA_DIST = ChangeLog ChangeLog-1.0 makeallimages \ +EXTRA_DIST = ChangeLog-1.0 makeallimages \ gschemdoc.sh makeimages print.scm image.scm -if HAVE_GIT_REPO -ChangeLog: $(top_builddir)/stamp-git - (cd $(srcdir) && $(GIT) log --pretty=medium $(CHANGELOG_BASE).. -- .) > $@ -endif HAVE_GIT_REPO - gschemdoc: gschemdoc.sh sed -e 's:[@]DOCDIR@:$(docdir):' < $(srcdir)/gschemdoc.sh > tmp_gschemdoc chmod a+x tmp_gschemdoc @@ -18,4 +13,4 @@ gschemdoc: gschemdoc.sh MOSTLYCLEANFILES = *.log *~ CLEANFILES = *.log *~ DISTCLEANFILES = *.log core FILE *~ gschemdoc -MAINTAINERCLEANFILES = *.log *~ Makefile.in gschemdoc +MAINTAINERCLEANFILES = *.log *~ Makefile.in ChangeLog gschemdoc diff --git a/gsymcheck/Makefile.am b/gsymcheck/Makefile.am index 40ad7baf7..115b6509b 100644 --- a/gsymcheck/Makefile.am +++ b/gsymcheck/Makefile.am @@ -11,4 +11,4 @@ endif HAVE_GIT_REPO MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog diff --git a/libgeda/Makefile.am b/libgeda/Makefile.am index 2b9f142fc..2ecda29eb 100644 --- a/libgeda/Makefile.am +++ b/libgeda/Makefile.am @@ -18,4 +18,4 @@ endif HAVE_GIT_REPO MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ DISTCLEANFILES = *.log core FILE *~ libgeda.pc po/domain.mak -MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in libgeda.pc +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in libgeda.pc ChangeLog diff --git a/libgeda/share/Makefile.am b/libgeda/share/Makefile.am index 7a7dfeec0..8f1f08f92 100644 --- a/libgeda/share/Makefile.am +++ b/libgeda/share/Makefile.am @@ -5,3 +5,9 @@ prologdatadir = $(GEDADATADIR) prologdata_DATA = prolog.ps EXTRA_DIST = $(prologdata_DATA) + +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in + diff --git a/symbols/Makefile.am b/symbols/Makefile.am index c64e790b7..f88681392 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -61,15 +61,12 @@ nobase_dist_datasym_DATA = \ vhdl/verilog2vhdl.sh vhdl/script.sed EXTRA_DIST = ChangeLog ChangeLog-1.0 \ - font/README font/ChangeLog font/ChangeLog-1.0 \ + font/README font/ChangeLog-1.0 \ radio/README AUTHORS if HAVE_GIT_REPO ChangeLog: $(top_builddir)/stamp-git (cd $(srcdir) && $(GIT) log --pretty=medium $(CHANGELOG_BASE).. -- .) > $@ -font/ChangeLog: - $(MKDIR_P) font && \ - (cd $(srcdir) && $(GIT) log --pretty=medium $(CHANGELOG_BASE).. -- ./font) > $@ endif HAVE_GIT_REPO # Copies symbols into distribution @@ -110,4 +107,4 @@ uninstall-local: MOSTLYCLEANFILES = *.log *~ CLEANFILES = *.log *~ DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log *~ Makefile.in +MAINTAINERCLEANFILES = *.log *~ Makefile.in ChangeLog diff --git a/utils/Makefile.am b/utils/Makefile.am index 780a65568..46af594a0 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -12,4 +12,4 @@ endif HAVE_GIT_REPO MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ DISTCLEANFILES = *.log core FILE *~ -MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog diff --git a/utils/tests/Makefile.am b/utils/tests/Makefile.am index fdd3664e1..738a6b6f0 100644 --- a/utils/tests/Makefile.am +++ b/utils/tests/Makefile.am @@ -1,5 +1,8 @@ -## $Id$ -## SUBDIRS = refdes_renum gxyrs +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in + diff --git a/utils/tests/gxyrs/Makefile.am b/utils/tests/gxyrs/Makefile.am index 7cfa32f50..6f18e644c 100644 --- a/utils/tests/gxyrs/Makefile.am +++ b/utils/tests/gxyrs/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ -## SUBDIRS= inputs outputs @@ -13,3 +11,7 @@ TESTS= ${RUN_TESTS} EXTRA_DIST= ${RUN_TESTS} tests.list README.txt +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in diff --git a/utils/tests/gxyrs/inputs/Makefile.am b/utils/tests/gxyrs/inputs/Makefile.am index e84a8920a..76d25dce7 100644 --- a/utils/tests/gxyrs/inputs/Makefile.am +++ b/utils/tests/gxyrs/inputs/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ -## EXTRA_DIST= \ do_nothing.pl \ @@ -10,3 +8,8 @@ EXTRA_DIST= \ report1.txt \ report2.txt +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in + diff --git a/utils/tests/gxyrs/outputs/Makefile.am b/utils/tests/gxyrs/outputs/Makefile.am index eec91a1ad..b16eaed12 100644 --- a/utils/tests/gxyrs/outputs/Makefile.am +++ b/utils/tests/gxyrs/outputs/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ -## # dir | sort | awk '{printf("\t%s \\\n", $0)}' |grep -v Makefile >> Makefile.am @@ -246,3 +244,8 @@ EXTRA_DIST= \ translate_col_R10_value_case_insens-pcb_example1.xy-error \ translate_negative_col_num-pcb_example1.xy \ translate_negative_col_num-pcb_example1.xy-error + +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in diff --git a/utils/tests/refdes_renum/Makefile.am b/utils/tests/refdes_renum/Makefile.am index 7cfa32f50..00c6105e8 100644 --- a/utils/tests/refdes_renum/Makefile.am +++ b/utils/tests/refdes_renum/Makefile.am @@ -1,6 +1,3 @@ -## $Id$ -## - SUBDIRS= inputs outputs TESTS_ENVIRONMENT= PERL=${PERL} top_srcdir=${srcdir}/../.. @@ -13,3 +10,8 @@ TESTS= ${RUN_TESTS} EXTRA_DIST= ${RUN_TESTS} tests.list README.txt +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in + diff --git a/utils/tests/refdes_renum/inputs/Makefile.am b/utils/tests/refdes_renum/inputs/Makefile.am index a8fba0085..ecf5a4f02 100644 --- a/utils/tests/refdes_renum/inputs/Makefile.am +++ b/utils/tests/refdes_renum/inputs/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ -## EXTRA_DIST= \ allnew.sch \ @@ -12,3 +10,8 @@ EXTRA_DIST= \ someold2.sch \ someold3.sch +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in + diff --git a/utils/tests/refdes_renum/outputs/Makefile.am b/utils/tests/refdes_renum/outputs/Makefile.am index 79671f46c..babeb2a21 100644 --- a/utils/tests/refdes_renum/outputs/Makefile.am +++ b/utils/tests/refdes_renum/outputs/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ -## # ls *.sch | sort | awk '{printf("\t%s \\\n", $0)}' >> Makefile.am @@ -40,3 +38,8 @@ EXTRA_DIST= \ some_old_refdeses1-someold1.sch \ some_old_refdeses2-someold1.sch +MOSTLYCLEANFILES = *.log core FILE *~ +CLEANFILES = *.log core FILE *~ +DISTCLEANFILES = *.log core FILE *~ +MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in + -- 2.11.4.GIT