about summary refs log tree commit diff
path: root/GNUmakefile
diff options
context:
space:
mode:
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile26
1 files changed, 19 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 0103aa9f..33a01b43 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -145,11 +145,11 @@ endif
 MAJOR := $(NETPBM_MAJOR_RELEASE)
 MINOR := $(NETPBM_MINOR_RELEASE)
 POINT := $(NETPBM_POINT_RELEASE)
-version.h:
+version.h: $(SRCDIR)/Makefile.version
 	@rm -f $@
-	@echo "/* Generated by make file rule */" >$@
+	@echo "/* Generated by make file rule */" >>$@
 	@echo "#define NETPBM_VERSION" \
-	  \"Netpbm $(MAJOR).$(MINOR).$(POINT)"\"" >$@
+	  \"Netpbm $(MAJOR).$(MINOR).$(POINT)"\"" >>$@
 
 
 .PHONY: install
@@ -346,11 +346,14 @@ $(PKGDIR)/bin/doc.url: $(PKGDIR)/bin
 install-dev: install.hdr install.staticlib install.lib install.sharedlibstub
 
 .PHONY: install.hdr
-install.hdr: $(PKGDIR)/include
-	$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
-	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr
+install.hdr: lib/install.hdr $(PKGDIR)/include/netpbm
 	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
-	    $(BUILDDIR)/pm_config.h $(PKGDIR)/include
+	    $(BUILDDIR)/pm_config.h $(PKGDIR)/include/netpbm
+
+.PHONY: lib/install.hdr
+lib/install.hdr:
+	$(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \
+	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
 
 ifeq ($(STATICLIB_TOO),y)
 BUILD_STATIC = y
@@ -387,8 +390,17 @@ distclean: localdistclean
 .PHONY: localdistclean
 localdistclean: localclean
 	-rm -f `find -type l`
+	-rm -f TAGS
 	-rm -f Makefile.config
 
+# 'tags' generates/updates an Emacs tags file, anmed TAGS, in the current
+# directory.  Use with Emacs command 'find-tag'.
+
+.PHONY: tags
+tags:
+	find . -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" | \
+	  etags -
+
 # The following endif is for the else block that contains virtually the
 # whole file, for the test of the existence of CURDIR.
 endif