diff options
| author | Eli Zaretskii | 2009-08-28 13:58:52 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2009-08-28 13:58:52 +0000 |
| commit | 249b95643b147ae0c2ffbf4dcc479f3b531860a4 (patch) | |
| tree | 408b9d5be303deda405a51bcd498b698d06ac67f /src/makefile.w32-in | |
| parent | 3a94ba8225829c7fc84ef0a31dc67daa734ef193 (diff) | |
| download | emacs-249b95643b147ae0c2ffbf4dcc479f3b531860a4.tar.gz emacs-249b95643b147ae0c2ffbf4dcc479f3b531860a4.zip | |
(buildobj.h): Renamed from $(SRC)/buildobj.h.
(make-buildobj-CMD, make-buildobj-SH): Create buildobj.h, not
$(SRC)/buildobj.h.
($(BLD)/doc.$(O)): Depend on buildobj.h, not on $(SRC)/buildobj.h.
Diffstat (limited to 'src/makefile.w32-in')
| -rw-r--r-- | src/makefile.w32-in | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 6c682ca4d99..230512ee3c2 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in | |||
| @@ -182,24 +182,26 @@ $(TEMACS): $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \ | |||
| 182 | 182 | ||
| 183 | # These omit firstfile.${O}, but there's no documentation in there | 183 | # These omit firstfile.${O}, but there's no documentation in there |
| 184 | # anyways. | 184 | # anyways. |
| 185 | $(SRC)/buildobj.h: $(SRC)/makefile.w32-in | 185 | buildobj.h: $(SRC)/makefile.w32-in |
| 186 | $(MAKE) $(MFLAGS) make-buildobj-$(SHELLTYPE) | 186 | $(MAKE) $(MFLAGS) make-buildobj-$(SHELLTYPE) |
| 187 | 187 | ||
| 188 | # Cannot have blanks between the backslash and the redirection | ||
| 189 | # characters, because CMD's `echo' will put them in buildobj.h. | ||
| 188 | make-buildobj-CMD: | 190 | make-buildobj-CMD: |
| 189 | echo #define BUILDOBJ ^"\> $(SRC)/buildobj.h | 191 | echo #define BUILDOBJ ^"\> buildobj.h |
| 190 | echo $(OBJ0) \>> $(SRC)/buildobj.h | 192 | echo $(OBJ0) \>> buildobj.h |
| 191 | echo $(OBJ1) \>> $(SRC)/buildobj.h | 193 | echo $(OBJ1) \>> buildobj.h |
| 192 | echo $(WIN32OBJ) \>> $(SRC)/buildobj.h | 194 | echo $(WIN32OBJ) \>> buildobj.h |
| 193 | echo $(FONTOBJ) \>> $(SRC)/buildobj.h | 195 | echo $(FONTOBJ) \>> buildobj.h |
| 194 | echo ^">> $(SRC)/buildobj.h | 196 | echo ^">> buildobj.h |
| 195 | 197 | ||
| 196 | make-buildobj-SH: | 198 | make-buildobj-SH: |
| 197 | echo '#define BUILDOBJ $(DQUOTE)\' > $(SRC)/buildobj.h | 199 | echo '#define BUILDOBJ $(DQUOTE)\' > buildobj.h |
| 198 | echo $(OBJ0) '\' >> $(SRC)/buildobj.h | 200 | echo $(OBJ0) '\' >> buildobj.h |
| 199 | echo $(OBJ1) '\' >> $(SRC)/buildobj.h | 201 | echo $(OBJ1) '\' >> buildobj.h |
| 200 | echo $(WIN32OBJ) '\' >> $(SRC)/buildobj.h | 202 | echo $(WIN32OBJ) '\' >> buildobj.h |
| 201 | echo $(FONTOBJ) '\' >> $(SRC)/buildobj.h | 203 | echo $(FONTOBJ) '\' >> buildobj.h |
| 202 | echo '$(DQUOTE)' >> $(SRC)/buildobj.h | 204 | echo '$(DQUOTE)' >> buildobj.h |
| 203 | 205 | ||
| 204 | bootstrap: bootstrap-emacs | 206 | bootstrap: bootstrap-emacs |
| 205 | 207 | ||
| @@ -597,7 +599,7 @@ $(BLD)/dispnew.$(O) : \ | |||
| 597 | $(BLD)/doc.$(O) : \ | 599 | $(BLD)/doc.$(O) : \ |
| 598 | $(SRC)/doc.c \ | 600 | $(SRC)/doc.c \ |
| 599 | $(CONFIG_H) \ | 601 | $(CONFIG_H) \ |
| 600 | $(SRC)/buildobj.h \ | 602 | buildobj.h \ |
| 601 | $(EMACS_ROOT)/nt/inc/unistd.h \ | 603 | $(EMACS_ROOT)/nt/inc/unistd.h \ |
| 602 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 604 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 603 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 605 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |