From 878bde492768ea1e0dca48391d1612766f552730 Mon Sep 17 00:00:00 2001 From: Ken Raeburn <raeburn@raeburn.org> Date: Wed, 26 Aug 2009 08:28:23 +0000 Subject: * Makefile.in (buildobj.h): New target. (doc.o): Depend on it. (temacs${EXEEXT}): Don't generate buildobj.lst. (mostlyclean): Delete buildobj.h, not buildobj.lst. * makefile.w32-in ($(SRC)/buildobj.h): New target. ($(BLD)/doc.$(O)): Depend on it. (make-buildobj-CMD, make-buildobj-SH): New targets. (Syntax help provided by Eli Zaretskii.) ($(TEMACS)): Don't generate buildobj.lst. * doc.c: Include buildobj.h. (buildobj): New static variable. (Fsnarf_documentation): Use it, instead of opening and reading buildobj.lst. --- src/makefile.w32-in | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/makefile.w32-in') diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 05696072ec0..f3468a0482a 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -178,10 +178,24 @@ $(TEMACS): $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \ ../nt/$(BLD)/addsection.exe $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21 - echo $(OBJ0) > $(BLD)/buildobj.lst - echo $(OBJ1) >> $(BLD)/buildobj.lst - echo $(WIN32OBJ) >> $(BLD)/buildobj.lst - echo $(FONTOBJ) >> $(BLD)/buildobj.lst + +# These omit firstfile.${O}, but there's no documentation in there +# anyways. +$(SRC)/buildobj.h: make-buildobj-$(SHELLTYPE) +make-buildobj-CMD: Makefile + echo #define BUILDOBJ ^"\ > $(SRC)/buildobj.h + echo $(OBJ0) \ >> $(SRC)/buildobj.h + echo $(OBJ1) \ >> $(SRC)/buildobj.h + echo $(WIN32OBJ) \ >> $(SRC)/buildobj.h + echo $(FONTOBJ) \ >> $(SRC)/buildobj.h + echo ^" >> $(SRC)/buildobj.h +make-buildobj-SH: Makefile + echo '#define BUILDOBJ $(DQUOTE)\\' > $(SRC)/buildobj.h + echo $(OBJ0) '\\' >> $(SRC)/buildobj.h + echo $(OBJ1) '\\' >> $(SRC)/buildobj.h + echo $(WIN32OBJ) '\\' >> $(SRC)/buildobj.h + echo $(FONTOBJ) '\\' >> $(SRC)/buildobj.h + echo '$(DQUOTE)' >> $(SRC)/buildobj.h bootstrap: bootstrap-emacs @@ -580,6 +594,7 @@ $(BLD)/dispnew.$(O) : \ $(BLD)/doc.$(O) : \ $(SRC)/doc.c \ $(CONFIG_H) \ + $(SRC)/buildobj.h \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ -- cgit v1.2.1