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

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/08/27 18:33:10

Modified files:
        src            : makefile.w32-in 

Log message:
        (SRC): Move to before where it's first used.
        ($(SRC)/buildobj.h, make-buildobj-CMD, make-buildobj-SH): Fix last 
change.

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

Patches:
Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/makefile.w32-in,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- makefile.w32-in     26 Aug 2009 08:28:25 -0000      1.78
+++ makefile.w32-in     27 Aug 2009 18:33:10 -0000      1.79
@@ -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,20 +182,23 @@
 
 # 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
+$(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 \