Branch: Tag:

2002-03-09

2002-03-09 18:20:53 by Martin Stjernholm <mast@lysator.liu.se>

Fixed some more dependencies for tpike to make it work also when the
autogenerated dependencies doesn't exist. Only do make depend in
post_modules when a fresh pike has been built since it's needed for
the autogenerated sources there.

Rev: src/Makefile.in:1.290

1:   # - # $Id: Makefile.in,v 1.289 2002/03/09 16:45:22 mast Exp $ + # $Id: Makefile.in,v 1.290 2002/03/09 18:20:53 mast Exp $   #      # This line is needed on some machines.
163:    lib @EXTRA_MODULE_REQUIREMENTS@      SRC_TARGETS= \ -  $(SRCDIR)/peep_engine.c \ -  $(SRCDIR)/case_info.h \ -  $(SRCDIR)/treeopt.h \ +     $(SRCDIR)/language.c \    $(SRCDIR)/language.h \    $(SRCDIR)/interpret_protos.h \    @PMOD_TARGETS@    -  + TPIKE_TARGETS= \ +  $(SRCDIR)/peep_engine.c \ +  $(SRCDIR)/case_info.h \ +  $(SRCDIR)/treeopt.h \ +    #   # The following objectfiles differ between tpike & pike:   #
239:    @echo 'End of summary'    @echo '--------------'    - tpike-real: $(OBJ) $(TOBJ) modules/linker_options + tpike-real: $(SRC_TARGETS) $(OBJ) $(TOBJ) modules/linker_options    -@rm -f tpike || :    $(LD) $(LDFLAGS) $(OBJ) $(TOBJ) `cat modules/linker_options` $(LIBS) -o tpike   
655:    @echo foo > stamp-tpike-predep      # make dependencies - depend: $(SRC_TARGETS) + depend: $(SRC_TARGETS) $(TPIKE_TARGETS)    gcc -MM -MG $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)    -@(while :; do \    echo foo > cfl.$@; test "`echo cfl.*`" = cfl.$@ && break; \
665:    CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status || \    (EXITCODE=$$?; rm cfl.$@; exit $$EXITCODE)    -@rm cfl.$@ -  @for d in modules post_modules; do \ -  ( cd $$d && { \ +  @( cd modules && { \    rm -f remake; \    $(MAKE) $(MAKE_FLAGS) depend || \    { test -f remake && $(MAKE) $(MAKE_FLAGS) depend; }; \ -  }); \ -  done +  }) +  @if [ "x$(RUNPIKE)" != "x$(DEFAULT_RUNPIKE)" -o -x $(TMP_BUILDDIR)/pike ]; then \ +  $(MAKE) $(MAKE_FLAGS) post_modules_depend; \ +  else \ +  echo "Skipping make depend in post_modules since a fresh pike is"; \ +  echo "needed to make the autogenerated sources there."; \ +  :; \ +  fi    -  + post_modules_depend: +  @if [ "x$(RUNPIKE)" != "x$(DEFAULT_RUNPIKE)" -o -x $(TMP_BUILDDIR)/pike ]; then :; \ +  else $(MAKE) $(MAKE_FLAGS) $(MAKE_PARALLEL) pike; fi +  @( cd post_modules && { \ +  rm -f remake; \ +  $(MAKE) $(MAKE_FLAGS) depend || \ +  { test -f remake && $(MAKE) $(MAKE_FLAGS) depend; }; \ +  }) +    #   # Pike internal targets   #
699:      module.o: modules/modlist_headers.h modules/modlist.h    + module_t.o: modules/modlist_headers.h modules/modlist.h +    $(SRCDIR)/interpret_protos.h_src: $(SRCDIR)/interpret_functions.h $(SRCDIR)/strip_opcodes    $(CPP) $(PREFLAGS) -DGEN_PROTOS $(SRCDIR)/interpret_functions.h | $(SRCDIR)/strip_opcodes >$(SRCDIR)/interpret_protos.h_src || { rm $(SRCDIR)/interpret_protos.h_src; exit 1; }   
717:    sed -e 's/YY_COUNT_TYPE/@YY_COUNT_TYPE@/' <y.tab.c >language.c &&\    mv y.tab.h language.h_src && rm y.tab.c)    - $(SRCDIR)/language.c: $(SRCDIR)/language.h_src -  touch $(SRCDIR)/language.c +     -  +    interpret_functions_fixed.h: $(SRCDIR)/interpret_functions.h precompile.sh-stamp    ./precompile.sh --cache make_interpret_functions.pike >"$@" "$(SRCDIR)/interpret_functions.h" || { rm "$@"; exit 1; }