diff options
| author | Eli Zaretskii <[email protected]> | 2009-08-27 18:33:44 +0000 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2009-08-27 18:33:44 +0000 |
| commit | 877610de125eae6c2e455db0f639e8ba6b0befdf (patch) | |
| tree | febf210429ed52980a6631cf6f49d5ba8b17c0b0 /src | |
| parent | 9421bdd19ff0b5e5d3101975208a9b7ae26f1b3e (diff) | |
(SRC): Move to before where it's first used.
($(SRC)/buildobj.h, make-buildobj-CMD, make-buildobj-SH): Fix last change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/makefile.w32-in | 35 |
2 files changed, 25 insertions, 16 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 12f3185a3e..60694b889d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-08-27 Eli Zaretskii <[email protected]> + + * 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 <[email protected]> * process.c (send_process): Use encode_coding_object instead of diff --git a/src/makefile.w32-in b/src/makefile.w32-in index f3468a0482..6c682ca4d9 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 \ |