diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-04-22 00:09:45 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-04-22 00:09:45 +0000 |
commit | fee986a7aa6ca2310366ae61620f521c5409c313 (patch) | |
tree | 72e724a86d2d6f9ba1107147a50eb1dd414813fa | |
parent | 1c8ef2f9136c2b7698c243c9bcdf01298c75ecbf (diff) | |
download | netpbm-mirror-fee986a7aa6ca2310366ae61620f521c5409c313.tar.gz netpbm-mirror-fee986a7aa6ca2310366ae61620f521c5409c313.tar.xz netpbm-mirror-fee986a7aa6ca2310366ae61620f521c5409c313.zip |
Remove standard.ppmdfont as dependency of standardppmdfont.c
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2962 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | doc/HISTORY | 4 | ||||
-rw-r--r-- | lib/Makefile | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index b37be8cd..581e42ab 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -32,6 +32,10 @@ not yet BJH Release 10.79.00 (September 2007), but wouldn't even compile until Netpbm 10.42 (March 2008)). + Build: don't try to build standardppmdfont.c if it already + exists (so don't require ppmdcfont to exist). Broken around + Netpbm 10.35 (2006). + Debian packaging: fix bug: don't try to include Manweb files, as it is no longer packaged by 'make package'. diff --git a/lib/Makefile b/lib/Makefile index 7af07803..a0f33745 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -191,11 +191,14 @@ libnetpbm.$(STATICLIBSUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X) endif -# To avoid major hassles with having ppmdcfont available here, we just -# ship a pre-made standardppmfont.c, so this rule will not normally be -# used. -standardppmdfont.c: standard.ppmdfont - ppmdcfont <$< >$@ +# To avoid major hassles with having ppmdcfont available here, we just ship a +# pre-made standardppmfont.c, so this rule will not normally be used. Though +# standardppmdfont.c depends upon standard.ppmdfont, we don't declare that +# here because when the user creates the source tree, the modification time of +# standard.ppmdfont may end up later than that of standardppmdfont.c, which +# would make the build want to rebuild it. +standardppmdfont.c: + ppmdcfont <standard.ppmdfont >$@ # Note that we create a new compile.h only for the first make after a # make clean. This is good enough. We used to do stamp-date for |