Mercurial > emacs
changeset 104649:bfbe36e44416
(SRC): Move to before where it's first used.
($(SRC)/buildobj.h, make-buildobj-CMD, make-buildobj-SH): Fix last change.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 27 Aug 2009 18:33:10 +0000 |
| parents | a9e9aa0de2e5 |
| children | bbf8f938f283 |
| files | src/makefile.w32-in |
| diffstat | 1 files changed, 19 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/makefile.w32-in Thu Aug 27 18:32:37 2009 +0000 +++ b/src/makefile.w32-in Thu Aug 27 18:33:10 2009 +0000 @@ -31,6 +31,7 @@ # 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 @@ # 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 @@ ### DEPENDENCIES ### EMACS_ROOT = .. -SRC = . CONFIG_H = $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/src/config.h \