From 877610de125eae6c2e455db0f639e8ba6b0befdf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 27 Aug 2009 18:33:44 +0000 Subject: [PATCH] (SRC): Move to before where it's first used. ($(SRC)/buildobj.h, make-buildobj-CMD, make-buildobj-SH): Fix last change. --- src/ChangeLog | 6 ++++++ src/makefile.w32-in | 35 +++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 12f3185a3ed..60694b889d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-08-27 Eli Zaretskii + + * makefile.w32-in ($(SRC)/buildobj.h, make-buildobj-CMD) + (make-buildobj-SH): Fix last change. + (SRC): Move to before where it's first used. + 2009-08-27 Kenichi Handa * process.c (send_process): Use encode_coding_object instead of diff --git a/src/makefile.w32-in b/src/makefile.w32-in index f3468a0482a..6c682ca4d99 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -31,6 +31,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp # LOCAL_FLAGS = -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS) +SRC = . EMACS = $(BLD)/emacs.exe TEMACS = $(BLD)/temacs.exe TEMACS_TMP = $(BLD)/temacs.bin @@ -181,21 +182,24 @@ $(TEMACS): $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \ # 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 +$(SRC)/buildobj.h: $(SRC)/makefile.w32-in + $(MAKE) $(MFLAGS) make-buildobj-$(SHELLTYPE) + +make-buildobj-CMD: + 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: + 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 @@ -290,7 +294,6 @@ cleanall: clean ### DEPENDENCIES ### EMACS_ROOT = .. -SRC = . CONFIG_H = $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/src/config.h \ -- 2.11.4.GIT