diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-10-14 02:04:48 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-10-14 02:04:48 +0000 |
| commit | 125866f73191d541f6c4870aadbafe26db5f4741 (patch) | |
| tree | 58545374d0347dbcecfee7ed8b139c0c13835d3b | |
| parent | 4ddb7c2e4c6e09d20c65388cc2dc710b0422c2d4 (diff) | |
| download | netpbm-mirror-125866f73191d541f6c4870aadbafe26db5f4741.tar.gz netpbm-mirror-125866f73191d541f6c4870aadbafe26db5f4741.tar.xz netpbm-mirror-125866f73191d541f6c4870aadbafe26db5f4741.zip | |
Make 'make clean' clean icon/netpbm.o
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2651 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 3 | ||||
| -rw-r--r-- | icon/Makefile | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index caf8e37d..ca2181b3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -74,7 +74,7 @@ include $(BUILDDIR)/config.mk PROG_SUBDIRS = converter analyzer editor generator other PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS) -SUPPORT_SUBDIRS = urt buildtools test +SUPPORT_SUBDIRS = urt icon buildtools test SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS) diff --git a/doc/HISTORY b/doc/HISTORY index c2085824..2cc09faa 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -13,6 +13,9 @@ not yet BJH Release 10.73.00 Build: fix superfluous error message when USER environment variable contains whitespace. Broken since primordial Netpbm. + Windows build: fix bug: make clean doesn't clean icon/netpbm.o. + Broken since Netpbm 10.67 (June 2014). + 15.09.26 BJH Release 10.72.00 Add pamunlookup . diff --git a/icon/Makefile b/icon/Makefile index 2181c88b..95786c37 100644 --- a/icon/Makefile +++ b/icon/Makefile @@ -6,7 +6,13 @@ SUBDIR = buildtools VPATH = .:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/config.mk -all: netpbm.ico +.PHONY: default +default: netpbm.o + +# We must not attempt to build netpbm.o if the build system does not +# have 'windres', so our all list is empty. +.PHONY: all +all: include $(SRCDIR)/common.mk |