Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: zsh-3.1.5 pre-pws-8: make dependencies



This is supposed to improve some make dependencies; no obvious circularity
problems yet...

1. Makemod didn't get remade when the version changed,

2. main.o didn't get remade when zsh.h changed,

3. zshpaths.h didn't get remade when Makemod (which defines the module
directory from $(VERSION) as it appears in Makemod itself) changed.
I have a suspicion FORCE is supposed to do something in this area.

--- Src/Makefile.in.deps	Sat Feb 13 14:15:31 1999
+++ Src/Makefile.in	Sat Feb 13 15:39:24 1999
@@ -85,7 +85,9 @@
 rm-modobjs-tmp:
 	rm -f stamp-modobjs.tmp
 
-Makemod modules.index prep: modules-bltin
+@@config.mk@@
+
+Makemod modules.index prep: modules-bltin $(CONFIG_INCS)
 	( cd $(sdir_top) && $(SHELL) $(subdir)/mkmodindex.sh $(subdir) ) \
 	    > modules.index.tmp
 	@if cmp -s modules.index.tmp modules.index; then \
@@ -200,6 +202,4 @@
 modobjs modules headers proto $(MAIN_OBJS): Makemod
 	@$(MAKE) -f Makemod $(MAKEDEFS) $@
 
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-@@config.mk@@
+$(MAIN_OBJS): $(sdir)/zsh.h
--- Src/zsh.mdd.deps	Mon Feb  8 18:14:39 1999
+++ Src/zsh.mdd	Sat Feb 13 14:23:35 1999
@@ -28,7 +28,7 @@
 version.h: $(sdir_top)/Config/version.mk
 	echo '#define ZSH_VERSION "'$(VERSION)'"' > $@
 
-zshpaths.h: FORCE
+zshpaths.h: FORCE Makemod
 	@echo '#define MODULE_DIR "'$(MODDIR)'"' > zshpaths.h.tmp
 	@if cmp -s zshpaths.h zshpaths.h.tmp; then \
 	    rm -f zshpaths.h.tmp; \

-- 
Peter Stephenson <pws@xxxxxxxxxxxxxxxxx>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy



Messages sorted by: Reverse Date, Date, Thread, Author