Branch: Tag:

2006-06-18

2006-06-18 16:24:12 by Martin Stjernholm <mast@lysator.liu.se>

Dependency fixes.

Rev: src/Makefile.in:1.425

1:   # - # $Id: Makefile.in,v 1.424 2006/06/18 14:52:32 mast Exp $ + # $Id: Makefile.in,v 1.425 2006/06/18 16:24:12 mast Exp $   #      # This line is needed on some machines.
209:   #      # Update the dumped modules, but only if dump_modules has been used earlier. - all: module_objects post_module_objects tools + all: module_objects post_module_objects pike-complete-stamp tools    if [ -f dumpversion ]; then $(MAKE) $(MAKE_FLAGS) dump_modules; else :; fi -  $(MAKE) $(MAKE_FLAGS) $(MAKE_PARALLEL) pike +     @if [ "`find . -name '*.fail' -print`" = "" ]; then :; else \    echo; \    echo "Pike compiled and linked ok, but the following file(s) "; \
364:   splint:    splint $(PREFLAGS) -warnposix +charintliteral -realcompare -boolops -predboolint $(FILE)    - atom: pike + atom: pike-complete-stamp    atom pike -tool atom -env threads -g -v `find lib/modules -type f -name '*.so' -print | sed -e 's/^/-incobj /g'`    mv pike pike.pre-atom    mv pike.third.threads pike    @echo Make sure you have '.' in your LD_LIBRARY_PATH.    - pixie: pike + pixie: pike-complete-stamp    atom pike -tool pixie -env threads -g -v `find lib/modules -type f -name '*.so' -print | sed -e 's/^/-incobj /g'`    mv pike pike.pre-pixie    mv pike.pixie.threads pixie
388:    ( sed -e 's!pike!$(exec_prefix)/pike!' <$(TMP_BINDIR)/rsif \    >./rsif && chmod 755 ./rsif) || exit 1 ;    - dump_modules: pike master-stamp + dump_modules: pike-complete-stamp master-stamp    -rm dumpmodule.log    args="$(DUMPARGS)"; \    args=$${args:-"--log-file --update-only=dumpversion --report-failed"}; \
545:    @:      # install - install: pike tools + install: pike-complete-stamp tools    @$(RUNPIKE) $(TMP_BINDIR)/install.pike \    exec_prefix="$(exec_prefix)" lib_prefix="$(lib_prefix)" \    TMP_LIBDIR="$(TMP_LIBDIR)" LIBDIR_SRC="$(LIBDIR_SRC)" \
555:    fakeroot="$(buildroot)" PIKE_MODULE_RELOC="$(PIKE_MODULE_RELOC)" \    $(INSTALLARGS)    - install_interactive: pike tools + install_interactive: pike-complete-stamp tools    @$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive \    exec_prefix="$(exec_prefix)" prefix=$(prefix) \    TMP_LIBDIR="$(TMP_LIBDIR)" LIBDIR_SRC="$(LIBDIR_SRC)" \
579:    -rm -f TAGS tags yacc.acts yacc.debug yacc.tmp *.debug.log a.out pike.tmp    -rm -f hilfe rsif master.pike compiler-warnings dumpmodule.log    -rm -f interpreter_debug.h lexer?.h -  -rm -f import-stamp modules-stamp post-modules-stamp master-stamp headerfiles-stamp +  -rm -f import-stamp master-stamp headerfiles-stamp +  -rm -f static-modules-stamp dynamic-modules-stamp +  -rm -f post-static-modules-stamp post-dynamic-modules-stamp +  -rm -f tpike-complete-stamp pike-complete-stamp    -rm -rf lib/modules/*   # -rm -f lib/master.pike   
826:    $(RUNPIKE) -x assemble_autodoc structure/modref.xml \    $(TMP_BUILDDIR)/autodoc.xml) >modref.xml    - autodoc.xml: pike doc_build/src doc_build/lib doc_build/images images1 images2 force + autodoc.xml: pike-complete-stamp doc_build/src doc_build/lib doc_build/images images1 images2 force    $(RUNPIKE) -x extract_autodoc -q --srcdir=$(SRCDIR) \    --imgsrc=$(DOCDIR)/src_images --builddir=doc_build/src \    --imgdir=doc_build/images
1020:   # Pike internal targets   #    - # touch modules-stamp here to avoid doing this work again if that - # target is checked later. + # touch static-modules-stamp here to avoid doing this work again if + # that target is checked later.   static_module_objects: $(MODULE_REQUIREMENTS)    @MODULE_BUILD_TYPE=static; \    export MODULE_BUILD_TYPE; \
1029:    ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \    ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \    ) || exit $$? -  @touch modules-stamp +  @touch static-modules-stamp    - modules-stamp: $(MODULE_REQUIREMENTS) + static-modules-stamp: $(MODULE_REQUIREMENTS)    @MODULE_BUILD_TYPE=static; \    export MODULE_BUILD_TYPE; \    ( cd modules && ( rm remake >/dev/null 2>&1 || : ) && \    ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \    ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \    ) || exit $$? -  @touch modules-stamp +  @touch static-modules-stamp    - dynamic_module_objects: $(MODULE_REQUIREMENTS) pike + dynamic_module_objects: $(MODULE_REQUIREMENTS) tpike    @MODULE_BUILD_TYPE=dynamic; \    export MODULE_BUILD_TYPE; \    ( cd modules && ( rm remake >/dev/null 2>&1 || : ) && \    ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \    ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \    ) || exit $$? -  +  @touch dynamic-modules-stamp    -  + dynamic-modules-stamp: $(MODULE_REQUIREMENTS) tpike +  @MODULE_BUILD_TYPE=dynamic; \ +  export MODULE_BUILD_TYPE; \ +  ( cd modules && ( rm remake >/dev/null 2>&1 || : ) && \ +  ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \ +  ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \ +  ) || exit $$? +  @touch dynamic-modules-stamp +    # Use submakes here to ensure both correct sequencing and that all   # modules are properly rechecked.   module_objects:    @$(MAKE) $(MAKE_FLAGS) static_module_objects    @$(MAKE) $(MAKE_FLAGS) dynamic_module_objects    - modules/modlist.h: modules-stamp + modules/modlist.h: static-modules-stamp    - modules/modlist_headers.h: modules-stamp + modules/modlist_headers.h: static-modules-stamp    - modules/linker_options: modules-stamp + modules/linker_options: static-modules-stamp    -  + tpike-complete-stamp: tpike dynamic-modules-stamp +  @touch tpike-complete-stamp +    module.o: modules/modlist_headers.h modules/modlist.h      tmodule.o: modules/modlist_headers.h modules/modlist.h
1067:   # Backward compat.   post_modules: post_module_objects    - # touch post-modules-stamp here to avoid doing this work again if that - # target is checked later. - post_static_module_objects: $(MODULE_REQUIREMENTS) tpike + post_static_module_objects: $(MODULE_REQUIREMENTS) tpike-complete-stamp    @MODULE_BUILD_TYPE=static; \    export MODULE_BUILD_TYPE; \    ( cd post_modules && ( rm remake >/dev/null 2>&1 || : ) && \    ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \    ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \    ) || exit $$? -  @touch post-modules-stamp +  @touch post-static-modules-stamp    - post-modules-stamp: $(MODULE_REQUIREMENTS) tpike + post-static-modules-stamp: $(MODULE_REQUIREMENTS) tpike-complete-stamp    @MODULE_BUILD_TYPE=static; \    export MODULE_BUILD_TYPE; \    ( cd post_modules && ( rm remake >/dev/null 2>&1 || : ) && \    ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \    ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \    ) || exit $$? -  @touch post-modules-stamp +  @touch post-static-modules-stamp    - post_dynamic_module_objects: $(MODULE_REQUIREMENTS) tpike + post_dynamic_module_objects: $(MODULE_REQUIREMENTS) tpike-complete-stamp    @MODULE_BUILD_TYPE=dynamic; \    export MODULE_BUILD_TYPE; \    ( cd post_modules && ( rm remake >/dev/null 2>&1 || : ) && \    ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \    ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \    ) || exit $$? -  +  @touch post-dynamic-modules-stamp    -  + post-dynamic-modules-stamp: $(MODULE_REQUIREMENTS) tpike-complete-stamp +  @MODULE_BUILD_TYPE=dynamic; \ +  export MODULE_BUILD_TYPE; \ +  ( cd post_modules && ( rm remake >/dev/null 2>&1 || : ) && \ +  ( $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) || \ +  ( test -f remake && $(MAKE) $(MAKE_PARALLEL) $(MAKE_FLAGS) ) ) \ +  ) || exit $$? +  @touch post-dynamic-modules-stamp +    # Use submakes here to ensure both correct sequencing and that all   # modules are properly rechecked.   post_module_objects:    @$(MAKE) $(MAKE_FLAGS) post_static_module_objects    @$(MAKE) $(MAKE_FLAGS) post_dynamic_module_objects    - post_modules/modlist_headers.h: post-modules-stamp + post_modules/modlist_headers.h: post-static-modules-stamp    - post_modules/modlist.h: post-modules-stamp + post_modules/modlist.h: post-static-modules-stamp    - post_modules/linker_options: post-modules-stamp + post_modules/linker_options: post-static-modules-stamp    -  + pike-complete-stamp: pike post-dynamic-modules-stamp +  @touch pike-complete-stamp +    $(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; }