diff options
29 files changed, 42 insertions, 36 deletions
@@ -1,3 +1,9 @@ +2009-01-08 Werner LEMBERG <wl@gnu.org> + + * */Makefile.* (CLEANADD, CLEANNOTSRCDIRADD, CLEANDIRADD): Renamed + to... + (MOSTLYCLEANADD, MOSTLYCLEANNOTSRCDIRADD, MOSTLYCLEANDIRADD): This. + 2009-01-06 Werner LEMBERG <wl@gnu.org> Remove heuristics for LIBEXT. diff --git a/Makefile.comm b/Makefile.comm index 19387ca9..0408ef40 100644 --- a/Makefile.comm +++ b/Makefile.comm @@ -37,11 +37,11 @@ YTABH= YTABC= GRAM= LIBCLEAN= -CLEANADD= -CLEANDIRADD= -CLEANNOTSRCDIRADD= +MOSTLYCLEANADD= +MOSTLYCLEANDIRADD= +MOSTLYCLEANNOTSRCDIRADD= MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS) $(GENHDRS) \ - depend.temp core y.output $(CLEANADD) + depend.temp core y.output $(MOSTLYCLEANADD) CLEANFILES=$(LIBCLEAN) DISTCLEANFILES=TAGS Makefile Makefile.dep REALCLEANFILES=$(YTABC) $(YTABH) @@ -66,11 +66,11 @@ fonts: mostlyclean: -rm -f $(MOSTLYCLEANFILES) - -rm -rf $(CLEANDIRADD) + -rm -rf $(MOSTLYCLEANDIRADD) -@if test `cd $(srcdir); pwd` = `pwd`; then \ :; \ else \ - rm -f $(CLEANNOTSRCDIRADD); \ + rm -f $(MOSTLYCLEANNOTSRCDIRADD); \ fi clean: mostlyclean diff --git a/Makefile.sub b/Makefile.sub index 5696ca5d..c34292d6 100644 --- a/Makefile.sub +++ b/Makefile.sub @@ -31,7 +31,7 @@ DISTCLEANFILES=\ site.bak \ groff.sum \ groff.log -CLEANADD=Makefile.cfg conftest* +MOSTLYCLEANADD=Makefile.cfg conftest* M4MACROS = \ $(srcdir)/m4/groff.m4 \ diff --git a/arch/misc/Makefile.sub b/arch/misc/Makefile.sub index dfeea814..9f12153e 100644 --- a/arch/misc/Makefile.sub +++ b/arch/misc/Makefile.sub @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -CLEANADD=shdeps.sed +MOSTLYCLEANADD=shdeps.sed all: shdeps.sed diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub index b2a171d7..1da996ec 100644 --- a/contrib/chem/Makefile.sub +++ b/contrib/chem/Makefile.sub @@ -25,7 +25,7 @@ ######################################################################## MAN1=chem.n -CLEANADD=chem chem.n README examples/README +MOSTLYCLEANADD=chem chem.n README examples/README # not all make programs have $(RM) predefined. RM=rm -f diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub index 725856f5..0a3267ad 100644 --- a/contrib/eqn2graph/Makefile.sub +++ b/contrib/eqn2graph/Makefile.sub @@ -19,7 +19,7 @@ # Makefile.sub # MAN1=eqn2graph.n -CLEANADD=eqn2graph +MOSTLYCLEANADD=eqn2graph all: eqn2graph diff --git a/contrib/gdiffmk/Makefile.sub b/contrib/gdiffmk/Makefile.sub index c0d8b69a..c3179ff3 100644 --- a/contrib/gdiffmk/Makefile.sub +++ b/contrib/gdiffmk/Makefile.sub @@ -25,7 +25,7 @@ ######################################################################## MAN1=gdiffmk.n -CLEANADD=gdiffmk tests/runtests +MOSTLYCLEANADD=gdiffmk tests/runtests all: gdiffmk diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub index fc83eb93..dec9f6d7 100644 --- a/contrib/grap2graph/Makefile.sub +++ b/contrib/grap2graph/Makefile.sub @@ -19,7 +19,7 @@ # Makefile.sub # MAN1=grap2graph.n -CLEANADD=grap2graph +MOSTLYCLEANADD=grap2graph all: grap2graph diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub index 0df3fbef..6d2666be 100644 --- a/contrib/groffer/Makefile.sub +++ b/contrib/groffer/Makefile.sub @@ -38,8 +38,8 @@ MAN1=groffer.n \ roff2text.n \ roff2x.n -CLEANADD=groffer HAVE_PERL HAVE_SHELL groffer.man \ - $(MAN1) $(ROFF2MAN) $(ROFF2PROGS) +MOSTLYCLEANADD=groffer HAVE_PERL HAVE_SHELL groffer.man \ + $(MAN1) $(ROFF2MAN) $(ROFF2PROGS) # not all make programs have $(RM) predefined. RM=rm -f diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub index 52138a6a..314552c8 100644 --- a/contrib/hdtbl/Makefile.sub +++ b/contrib/hdtbl/Makefile.sub @@ -79,7 +79,7 @@ EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'` GENFILES_=`echo $(GENFILES) | sed 's|examples/||g'` PROCESSEDEXAMPLEFILES_=`echo $(PROCESSEDEXAMPLEFILES) | sed 's|examples/||g'` -CLEANADD=\ +MOSTLYCLEANADD=\ gnu.eps \ $(PROCESSEDEXAMPLEFILES) \ $(GENFILES) \ diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub index cc74a9b6..bde215bc 100644 --- a/contrib/mm/Makefile.sub +++ b/contrib/mm/Makefile.sub @@ -27,7 +27,7 @@ MAN7=\ FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov # Local configuration files with default values. LOCALE=locale se_locale -CLEANADD=temp +MOSTLYCLEANADD=temp all: mmroff diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub index 639100f7..5aeba6e4 100644 --- a/contrib/mom/Makefile.sub +++ b/contrib/mom/Makefile.sub @@ -84,7 +84,7 @@ HTMLDOCFILES_=`echo $(HTMLDOCFILES) | sed 's|momdoc/||g'` EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'` PROCESSEDEXAMPLEFILES_=`echo $(PROCESSEDEXAMPLEFILES) | sed 's|examples/||g'` -CLEANADD=\ +MOSTLYCLEANADD=\ stamp-strip \ penguin.ps \ $(PROCESSEDEXAMPLEFILES) \ diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub index 238dec9c..0792a69e 100644 --- a/contrib/pdfmark/Makefile.sub +++ b/contrib/pdfmark/Makefile.sub @@ -29,7 +29,7 @@ TMACFILES=\ PDFDOCFILES=\ pdfmark.pdf -CLEANADD=\ +MOSTLYCLEANADD=\ gnu.eps \ $(PDFDOCFILES) \ $(CMDFILES) \ diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub index 42fd5c78..6deea79c 100644 --- a/contrib/pic2graph/Makefile.sub +++ b/contrib/pic2graph/Makefile.sub @@ -19,7 +19,7 @@ # Makefile.sub # MAN1=pic2graph.n -CLEANADD=pic2graph +MOSTLYCLEANADD=pic2graph all: pic2graph diff --git a/doc/Makefile.sub b/doc/Makefile.sub index 10d18770..15666bb5 100644 --- a/doc/Makefile.sub +++ b/doc/Makefile.sub @@ -88,7 +88,7 @@ imagedir=img htmldocimagedir=$(htmldocdir)/$(imagedir) exampleimagedir=$(exampledir)/$(imagedir) -CLEANADD=\ +MOSTLYCLEANADD=\ $(PROCESSEDDOCFILES) \ $(PROCESSEDEXAMPLEFILES) \ $(HTMLEXAMPLEFILESALL) \ @@ -98,10 +98,10 @@ CLEANADD=\ groff.st* groff.toc groff.tp groff.vr* \ examples.stamp -CLEANDIRADD=\ +MOSTLYCLEANDIRADD=\ $(imagedir) -CLEANNOTSRCDIRADD=\ +MOSTLYCLEANNOTSRCDIRADD=\ groff.css \ grnexmpl.g \ groff \ diff --git a/font/devascii/Makefile.sub b/font/devascii/Makefile.sub index 238f7b74..43b2b467 100644 --- a/font/devascii/Makefile.sub +++ b/font/devascii/Makefile.sub @@ -1,7 +1,7 @@ DEV=ascii FONTS=R I B BI DEVFILES=$(FONTS) DESC -CLEANADD=$(FONTS) DESC +MOSTLYCLEANADD=$(FONTS) DESC RES=240 CPI=10 diff --git a/font/devcp1047/Makefile.sub b/font/devcp1047/Makefile.sub index 42721cb9..4c2d1db1 100644 --- a/font/devcp1047/Makefile.sub +++ b/font/devcp1047/Makefile.sub @@ -1,7 +1,7 @@ DEV=cp1047 FONTS=R I B BI DEVFILES=$(FONTS) DESC -CLEANADD=$(FONTS) DESC +MOSTLYCLEANADD=$(FONTS) DESC RES=240 CPI=10 diff --git a/font/devdvi/Makefile.sub b/font/devdvi/Makefile.sub index 052e00a4..9eb95124 100644 --- a/font/devdvi/Makefile.sub +++ b/font/devdvi/Makefile.sub @@ -11,7 +11,7 @@ DEVFILES=DESC \ generate/ec.map generate/tc.map DEVSCRIPTS=generate/CompileFonts -CLEANADD=DESC +MOSTLYCLEANADD=DESC DESC: DESC.in cat $(srcdir)/DESC.in >DESC diff --git a/font/devhtml/Makefile.sub b/font/devhtml/Makefile.sub index 474c0f28..c1e5525b 100644 --- a/font/devhtml/Makefile.sub +++ b/font/devhtml/Makefile.sub @@ -2,7 +2,7 @@ DEV=html PROTOFONTS=R I B BI CR CI CB CBI FONTS=$(PROTOFONTS) S DEVFILES=$(FONTS) DESC -CLEANADD=$(FONTS) DESC +MOSTLYCLEANADD=$(FONTS) DESC RES=240 CPI=10 diff --git a/font/devlatin1/Makefile.sub b/font/devlatin1/Makefile.sub index 25de3f77..127e02cd 100644 --- a/font/devlatin1/Makefile.sub +++ b/font/devlatin1/Makefile.sub @@ -1,7 +1,7 @@ DEV=latin1 FONTS=R I B BI DEVFILES=$(FONTS) DESC -CLEANADD=$(FONTS) DESC +MOSTLYCLEANADD=$(FONTS) DESC RES=240 CPI=10 diff --git a/font/devlbp/Makefile.sub b/font/devlbp/Makefile.sub index 16335d33..7ef429dd 100644 --- a/font/devlbp/Makefile.sub +++ b/font/devlbp/Makefile.sub @@ -7,7 +7,7 @@ DEVFILES=DESC \ CR CB CI \ ER EB EI -CLEANADD=DESC +MOSTLYCLEANADD=DESC DESC: DESC.in -rm -f DESC diff --git a/font/devlj4/Makefile.sub b/font/devlj4/Makefile.sub index 0ad3f4da..a8cd61b3 100644 --- a/font/devlj4/Makefile.sub +++ b/font/devlj4/Makefile.sub @@ -22,7 +22,7 @@ DEVFILES=DESC \ generate/wingdings.map \ generate/special.awk -CLEANADD=DESC +MOSTLYCLEANADD=DESC DESC: DESC.in -rm -f DESC diff --git a/font/devps/Makefile.sub b/font/devps/Makefile.sub index 723490ce..e4aa038d 100644 --- a/font/devps/Makefile.sub +++ b/font/devps/Makefile.sub @@ -33,7 +33,7 @@ DEVFILES=DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES) OLDDEVFILES=$(OLDDISTFILES) DEVSCRIPTS=$(DEVGENSCRIPTS) -CLEANADD=DESC $(PSFILES) +MOSTLYCLEANADD=DESC $(PSFILES) DESC: DESC.in -rm -f DESC diff --git a/font/devutf8/Makefile.sub b/font/devutf8/Makefile.sub index f6ce659c..221bd3f2 100644 --- a/font/devutf8/Makefile.sub +++ b/font/devutf8/Makefile.sub @@ -1,7 +1,7 @@ DEV=utf8 FONTS=R I B BI DEVFILES=$(FONTS) DESC -CLEANADD=$(FONTS) DESC +MOSTLYCLEANADD=$(FONTS) DESC RES=240 CPI=10 diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub index 4f6a8e95..a0098961 100644 --- a/src/preproc/eqn/Makefile.sub +++ b/src/preproc/eqn/Makefile.sub @@ -41,7 +41,7 @@ GRAM=$(srcdir)/eqn.y YTABC=eqn.cpp YTABH=eqn_tab.h NAMEPREFIX=$(g) -CLEANADD=neqn +MOSTLYCLEANADD=neqn all: neqn diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub index 1a3af28a..fb1b20e9 100644 --- a/src/roff/grog/Makefile.sub +++ b/src/roff/grog/Makefile.sub @@ -24,7 +24,7 @@ ######################################################################## MAN1=grog.n -CLEANADD=grog +MOSTLYCLEANADD=grog all: grog $(MAN1) diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub index 08b661cf..a682d859 100644 --- a/src/roff/nroff/Makefile.sub +++ b/src/roff/nroff/Makefile.sub @@ -1,6 +1,6 @@ MAN1=nroff.n NAMEPREFIX=$(g) -CLEANADD=nroff +MOSTLYCLEANADD=nroff all: nroff diff --git a/src/utils/afmtodit/Makefile.sub b/src/utils/afmtodit/Makefile.sub index 75d1466a..ce6d6e2c 100644 --- a/src/utils/afmtodit/Makefile.sub +++ b/src/utils/afmtodit/Makefile.sub @@ -1,5 +1,5 @@ MAN1=afmtodit.n -CLEANADD=afmtodit +MOSTLYCLEANADD=afmtodit all: afmtodit diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub index e5026524..ef4b577d 100644 --- a/tmac/Makefile.sub +++ b/tmac/Makefile.sub @@ -65,7 +65,7 @@ STRIPFILES=e.tmac doc.tmac doc-old.tmac MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms mdocdir=$(tmacdir)/mdoc -CLEANADD=\ +MOSTLYCLEANADD=\ stamp-wrap stamp-sed *-wrap www.tmac-sed \ stamp-strip e.tmac-s doc.tmac-s doc-old.tmac-s \ doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s mdoc.local-s |