Re: linked-in modules

[Zoltan Hidvegi <hzoli@xxxxxxxxxx>]

Zefram write:
> Zoltan Hidvegi wrote:
> >This Makefile will soon become the most complicated part of zsh.
> 
> You mean it's not already?  (I have another patch planned which will

Well there are still some trickery in exec.c which I'd like to understand
better.  Unfortunately with my previous patch in my attempt to get parallel
make work I did too much and make always wants to rebuild everything.  The
patch below backs up a bit so that parallel make will not work again (but
make -j3 proto && make -j3 still works).

> make it even worse.)

Oh!

> >! MODULE_DIRS = Modules Zle
> >--- 154,160 ----
> >! MODULE_DIRS = $(MODULE_DIR) Zle
> 
> Why is Src/Modules identified as $(MODULE_DIR)?  We already have two
> module directories, and you have suggested a Src/Builtins directory, so
> Src/Modules is really not unique.

Just for consistency.  But you are right that it would be more consistent
to use Modules everywhere and remove MODULE_DIR completely.

Zoltan


*** Src/Makefile.in	1996/12/24 01:31:03	3.1.1.2
--- Src/Makefile.in	1996/12/24 02:01:39
***************
*** 188,194 ****
  
  modules: $(ANSI@U@KNR) $(MO@D@ULE_DIRS)
  
! bin: zsh
  
  zsh: $(ANSI@U@KNR) $(@L@IBZSH) $(@L@OBJS) $(@L@STMP)
  	$(LINK) $(@L@OBJS) $(@L@LIST) $(LIBS)
--- 188,194 ----
  
  modules: $(ANSI@U@KNR) $(MO@D@ULE_DIRS)
  
! bin: proto zsh
  
  zsh: $(ANSI@U@KNR) $(@L@IBZSH) $(@L@OBJS) $(@L@STMP)
  	$(LINK) $(@L@OBJS) $(@L@LIST) $(LIBS)
***************
*** 211,217 ****
  	$(AWK) -f $(srcdir)/rlimits.awk $(RLIMITS_INC_H) > rlimits.h || \
  	    echo WARNING: unknown limits:  mail rlimits.h to developers
  
! $(OBJS): proto $(HDRS)
  
  init.o: bltinmods.list zshpaths.h
  
--- 211,217 ----
  	$(AWK) -f $(srcdir)/rlimits.awk $(RLIMITS_INC_H) > rlimits.h || \
  	    echo WARNING: unknown limits:  mail rlimits.h to developers
  
! $(OBJS): $(HDRS)
  
  init.o: bltinmods.list zshpaths.h
  
***************
*** 261,267 ****
  $(MODBINS):
  	echo $(@D@YNAMIC_XMODS) > $@
  
! proto: $(PROTO) proto-recursive FORCE
  
  $(PROTO): makepro.sed
  
--- 261,267 ----
  $(MODBINS):
  	echo $(@D@YNAMIC_XMODS) > $@
  
! proto: $(PROTO) proto-recursive
  
  $(PROTO): makepro.sed
  
*** Src/Zle/Makefile.in	1996/12/24 01:31:03	3.1.1.2
--- Src/Zle/Makefile.in	1996/12/24 02:00:05
***************
*** 105,116 ****
  # default target
  all: modules
  
! modules: $(MODULES)
  
  zle.so: $(ZLEOBJS)
  	$(LINK) $(ZLEOBJS)
  
! $(OBJS): proto $(HDRS)
  
  proto: $(PROTO)
  
--- 105,116 ----
  # default target
  all: modules
  
! modules: proto $(MODULES)
  
  zle.so: $(ZLEOBJS)
  	$(LINK) $(ZLEOBJS)
  
! $(OBJS): $(HDRS)
  
  proto: $(PROTO)
  
*** Src/Modules/Makefile.in	1996/12/24 01:31:03	3.1.1.2
--- Src/Modules/Makefile.in	1996/12/24 02:19:48
***************
*** 96,104 ****
  # default target
  all: modules
  
! modules: $(MODULES)
! 
! $(MODULES): proto
  
  proto: $(PROTO)
  
--- 96,102 ----
  # default target
  all: modules
  
! modules: proto $(MODULES)
  
  proto: $(PROTO)
  
PATCH END (without this some mailers chop the last line of the patch)