From 0d80b8c726e4c008e67b9c19c8365674cbd5ff09 Mon Sep 17 00:00:00 2001 From: wl Date: Tue, 29 Jan 2013 11:07:10 +0000 Subject: Building clean-ups. * Makefile.in: Use $(top_srcdir) where appropriate. * Makefile.sub (M4MACROS): Add `fcntl-o.m4' and `localcharset.m4'. * font/devpdf/Makefile.sub (UTILFILES): Removed, unused. (MOSTLYCLEANADD): Add `BuildFoundries'. * src/devices/gropdf/Makefile.sub (MOSTLYCLEANADD): Add `pdfmom'. --- ChangeLog | 11 +++++++++++ Makefile.in | 32 ++++++++++++++++---------------- Makefile.sub | 34 +++++++++++++++++++++------------- font/devpdf/Makefile.sub | 6 ++---- src/devices/gropdf/Makefile.sub | 3 ++- 5 files changed, 52 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca3f827d..c4cc3752 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2013-01-29 Werner LEMBERG + + Building clean-ups. + + * Makefile.in: Use $(top_srcdir) where appropriate. + * Makefile.sub (M4MACROS): Add `fcntl-o.m4' and `localcharset.m4'. + + * font/devpdf/Makefile.sub (UTILFILES): Removed, unused. + (MOSTLYCLEANADD): Add `BuildFoundries'. + * src/devices/gropdf/Makefile.sub (MOSTLYCLEANADD): Add `pdfmom'. + 2013-01-24 Bernd Warken * Add a shell command to 'MANIFEST' that displays all man source diff --git a/Makefile.in b/Makefile.in index 7534e561..ec906699 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2006, 2009-2012 +# Copyright (C) 1989-2006, 2009-2013 # Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # @@ -442,7 +442,7 @@ PURIFYCCFLAGS= # Passing down MAKEOVERRIDES prevents $(MAKE) from containing a second # copy of $(MDEFINES) when making individual directories; this could # cause the argument list to become too long on some systems. -MDEFINES= \ +MDEFINES=\ "ALT_AWK_PROGS=$(ALT_AWK_PROGS)" \ "ALT_GHOSTSCRIPT_PROGS=$(ALT_GHOSTSCRIPT_PROGS)" \ "AR=$(AR)" \ @@ -722,7 +722,7 @@ $(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS) $(GNULIBDIRS) if test $(srcdir) = .; then \ srcdir=.; \ else \ - srcdir=`cd $(srcdir); pwd`/$@; \ + srcdir=$(top_srcdir)/$@; \ fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ @@ -738,7 +738,7 @@ $(CPROGDIRS) $(XPROGDIRS): FORCE $(LIBDIRS) if test $(srcdir) = .; then \ srcdir=.; \ else \ - srcdir=`cd $(srcdir); pwd`/$@; \ + srcdir=$(top_srcdir)/$@; \ fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ @@ -754,7 +754,7 @@ $(CCPROGDIRS): FORCE $(LIBDIRS) if test $(srcdir) = .; then \ srcdir=.; \ else \ - srcdir=`cd $(srcdir); pwd`/$@; \ + srcdir=$(top_srcdir)/$@; \ fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ @@ -770,7 +770,7 @@ $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCP if test $(srcdir) = .; then \ srcdir=.; \ else \ - srcdir=`cd $(srcdir); pwd`/$@; \ + srcdir=$(top_srcdir)/$@; \ fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ @@ -784,15 +784,16 @@ $(GNULIBDIRS): FORCE if test $(srcdir) = .; then \ srcdir=.; \ else \ - srcdir=`cd $(srcdir); pwd`/$@; \ + srcdir=$(top_srcdir)/$@; \ fi; \ test -d $@ || $(mkinstalldirs) $@; \ case $(do) in \ all) \ - cd $@; \ - args=`$(top_builddir)/config.status --config`; \ - test -f Makefile || eval $$srcdir/configure "$$args" --srcdir=$$srcdir; \ - $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ + cd $@; \ + args=`$(top_builddir)/config.status --config`; \ + test -f Makefile \ + || eval $$srcdir/configure "$$args" --srcdir=$$srcdir; \ + $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ esac $(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) @@ -802,7 +803,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE if test $(srcdir) = .; then \ srcdir=.; \ else \ - srcdir=`cd $(srcdir); pwd`/$@; \ + srcdir=$(top_srcdir)/$@; \ fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ @@ -819,14 +820,13 @@ dist: for d in $(DISTDIRS); do \ $(mkinstalldirs) tmp/$$d; \ done - srcdir=`cd $(srcdir); pwd`; \ cd tmp; \ cp ../Makefile .; \ - cp $$srcdir/* . 2>/dev/null || true; \ + cp $(top_srcdir)/* . 2>/dev/null || true; \ rm -rf CVS; \ for d in $(DISTDIRS); do \ (cd $$d; \ - cp $$srcdir/$$d/* . 2>/dev/null; \ + cp $(top_srcdir)/$$d/* . 2>/dev/null; \ rm -rf CVS || true); \ done; \ $(MAKE) srcdir=. VPATH=. distfiles; \ @@ -840,7 +840,7 @@ dist: fi); \ done; \ rm -f Makefile; \ - cp $$srcdir/Makefile.init Makefile + cp $(top_srcdir)/Makefile.init Makefile mv tmp groff-$(version)$(revision) tar cfh - groff-$(version)$(revision) | \ gzip -c >groff-$(version)$(revision).tar.gz diff --git a/Makefile.sub b/Makefile.sub index c34292d6..2e032a58 100644 --- a/Makefile.sub +++ b/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2006, 2009 +# Copyright (C) 1989-2000, 2001-2004, 2006, 2009, 2013 # Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # @@ -20,24 +20,32 @@ # Makefile.sub # DISTCLEANFILES=\ - config.status \ - config.log \ - config.cache \ - stamp-h \ Makefile \ - test-groff \ + config.cache \ + config.log \ + config.status \ + groff.log \ + groff.sum \ src/include/config.h \ - site.exp \ site.bak \ - groff.sum \ - groff.log -MOSTLYCLEANADD=Makefile.cfg conftest* + site.exp \ + stamp-h \ + test-groff + +MOSTLYCLEANADD=\ + Makefile.cfg \ + conftest* -M4MACROS = \ +M4MACROS=\ + $(srcdir)/m4/codeset.m4 \ + $(srcdir)/m4/fcntl-o.m4 \ + $(srcdir)/m4/glibc21.m4 \ $(srcdir)/m4/groff.m4 \ - $(srcdir)/m4/codeset.m4 $(srcdir)/m4/glibc21.m4 \ $(srcdir)/m4/iconv.m4 \ - $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-ld.m4 $(srcdir)/m4/lib-prefix.m4 + $(srcdir)/m4/lib-ld.m4 \ + $(srcdir)/m4/lib-link.m4 \ + $(srcdir)/m4/lib-prefix.m4 \ + $(srcdir)/m4/localcharset.m4 distfiles: configure diff --git a/font/devpdf/Makefile.sub b/font/devpdf/Makefile.sub index be607cf1..b94068c4 100644 --- a/font/devpdf/Makefile.sub +++ b/font/devpdf/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2011, 2013 Free Software Foundation, Inc. # Written by Deri James # # This file is part of groff. @@ -23,13 +23,11 @@ GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \ ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*` MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*` -UTILFILES=\ - BuildFoundries - MOSTLYCLEANADD=\ download \ DESC \ Foundry \ + util/BuildFoundries \ $(GROFF_FONT_FILES) \ $(ENC_FILES) \ $(MAP_FILES) diff --git a/src/devices/gropdf/Makefile.sub b/src/devices/gropdf/Makefile.sub index 6aa409d4..b43d2f09 100644 --- a/src/devices/gropdf/Makefile.sub +++ b/src/devices/gropdf/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 Free Software Foundation, Inc. # Written by Deri James # # This file is part of groff. @@ -26,6 +26,7 @@ CMDFILES=\ MOSTLYCLEANADD=\ gropdf \ + pdfmom \ $(MAN1) # Some `makes' don't predefine RM... -- cgit v1.2.1