From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 28 Aug 2009 13:58:52 +0000 (+0000)
Subject: (buildobj.h): Renamed from $(SRC)/buildobj.h.
X-Git-Tag: emacs-pretest-23.1.90~1627
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=249b95643b147ae0c2ffbf4dcc479f3b531860a4;p=emacs.git

(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.
---

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) \
 
 # These omit firstfile.${O}, but there's no documentation in there
 # anyways.
-$(SRC)/buildobj.h: $(SRC)/makefile.w32-in
+buildobj.h: $(SRC)/makefile.w32-in
 	$(MAKE) $(MFLAGS) make-buildobj-$(SHELLTYPE)
 
+# Cannot have blanks between the backslash and the redirection
+# characters, because CMD's `echo' will put them in buildobj.h.
 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
+	echo #define BUILDOBJ ^"\> buildobj.h
+	echo $(OBJ0)            \>> buildobj.h
+	echo $(OBJ1)            \>> buildobj.h
+	echo $(WIN32OBJ)        \>> buildobj.h
+	echo $(FONTOBJ)         \>> buildobj.h
+	echo ^">> 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
+	echo '#define BUILDOBJ $(DQUOTE)\'  > buildobj.h
+	echo $(OBJ0)                   '\' >> buildobj.h
+	echo $(OBJ1)                   '\' >> buildobj.h
+	echo $(WIN32OBJ)               '\' >> buildobj.h
+	echo $(FONTOBJ)                '\' >> buildobj.h
+	echo '$(DQUOTE)'                   >> buildobj.h
 
 bootstrap: bootstrap-emacs
 
@@ -597,7 +599,7 @@ $(BLD)/dispnew.$(O) : \
 $(BLD)/doc.$(O) : \
 	$(SRC)/doc.c \
 	$(CONFIG_H) \
-	$(SRC)/buildobj.h \
+	buildobj.h \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \