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

More Makefile improvements



This patch removes some unnecessary recursive make calls.

It depends probably on all Makefile.in patches that Zefram and myself
posted to the list before.

Zoltan


*** Src/Makefile.in	1996/12/26 21:46:52	3.1.1.7
--- Src/Makefile.in	1996/12/26 22:16:47
***************
*** 166,178 ****
  # default target
  all: bin modules
  
! modules: proto $(HDRS) $(ANSI@U@KNR)
! 	@test -z '$(MO@D@ULE_DIRS)' || $(MAKE) $(MAKEDEFS) $(MODULE_DIRS)
  
! bin: proto $(ANSI@U@KNR)
  	@$(MAKE) $(MAKEDEFS) zsh
  
! zsh: $(@L@IBZSH) $(@L@OBJS) $(@L@STMP)
  	$(LINK) $(@L@OBJS) $(@L@LIST) $(LIBS)
  
  $(LIBZSH): $(LIBOBJS) $(NSTMP)
--- 166,177 ----
  # default target
  all: bin modules
  
! modules: $(MO@D@ULE_DIRS)
  
! bin: proto $(HDRS) $(ANSI@U@KNR)
  	@$(MAKE) $(MAKEDEFS) zsh
  
! zsh: $(PROTO) $(@L@IBZSH) $(@L@OBJS) $(@L@STMP)
  	$(LINK) $(@L@OBJS) $(@L@LIST) $(LIBS)
  
  $(LIBZSH): $(LIBOBJS) $(NSTMP)
***************
*** 197,204 ****
  
  init.o: bltinmods.list zshpaths.h zshxmods.h
  
! $(MODULE_DIRS): FORCE
! 	@cd $@ && $(MAKE) $(MAKEDEFS) modules
  
  zshpaths.h: FORCE
  	@echo '#define MODULE_DIR "'$(MODDIR)'"' > zshpaths.h.tmp
--- 196,203 ----
  
  init.o: bltinmods.list zshpaths.h zshxmods.h
  
! $(MODULE_DIRS): proto $(HDRS) $(ANSI@U@KNR) FORCE
! 	@cd $@ && $(MAKE) $(MAKEDEFS) shobjs
  
  zshpaths.h: FORCE
  	@echo '#define MODULE_DIR "'$(MODDIR)'"' > zshpaths.h.tmp
*** Src/Modules/Makefile.in	1996/12/26 21:46:52	3.1.1.5
--- Src/Modules/Makefile.in	1996/12/26 21:48:46
***************
*** 107,113 ****
  all: modules
  
  modules: proto
! 	@$(MAKE) $(MAKEDEFS) $(MODULES)
  
  proto: $(PROTO)
  
--- 107,115 ----
  all: modules
  
  modules: proto
! 	@$(MAKE) $(MAKEDEFS) shobjs
! 
! shobjs: $(MODULES)
  
  proto: $(PROTO)
  
*** Src/Zle/Makefile.in	1996/12/26 21:46:52	3.1.1.5
--- Src/Zle/Makefile.in	1996/12/26 21:48:46
***************
*** 120,126 ****
  all: modules
  
  modules: proto
! 	@$(MAKE) $(MAKEDEFS) $(MODULES)
  
  zle.so: $(ZLEDOBJS)
  	$(DLLINK) $(ZLEDOBJS)
--- 120,128 ----
  all: modules
  
  modules: proto
! 	@$(MAKE) $(MAKEDEFS) shobjs
! 
! shobjs: $(MODULES)
  
  zle.so: $(ZLEDOBJS)
  	$(DLLINK) $(ZLEDOBJS)



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