[Emacs-diffs] emacs/src makefile.w32-in

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/08/28 13:58:52

Modified files:
        src            : makefile.w32-in 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/makefile.w32-in?cvsroot=emacs&r1=1.79&r2=1.80

Patches:
Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/makefile.w32-in,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- makefile.w32-in     27 Aug 2009 18:33:10 -0000      1.79
+++ makefile.w32-in     28 Aug 2009 13:58:52 -0000      1.80
@@ -182,24 +182,26 @@
 
 # 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)/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 \