src/makefile.w32-in: Simplify OBJ macros.

* makefile.w32-in (TLIB2): Rename from TLIBW32.
  (OBJ2): New macro.
  (WIN32OBJ, FONTOBJ): Remove.
  (OBJ1): Redistribute object files with OBJ2.
  (LIBS, $(TEMACS)): Use TLIB2.
  (make-buildobj-CMD, make-buildobj-SH): Use OBJ2.
  ($(TLIB2), TAGS, TAGS-LISP, TAGS-gmake): Depend on OBJ2.

2 files changed, 34 insertions, 27 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9100259c978..c938064feae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2010-10-13  Juanma Barranquero  <lekktu@gmail.com>
 
+        * makefile.w32-in (TLIB2): Rename from TLIBW32.
+        (OBJ2): New macro.
+        (WIN32OBJ, FONTOBJ): Remove.
+        (OBJ1): Redistribute object files with OBJ2.
+        (LIBS, $(TEMACS)): Use TLIB2.
+        (make-buildobj-CMD, make-buildobj-SH): Use OBJ2.
+        ($(TLIB2), TAGS, TAGS-LISP, TAGS-gmake): Depend on OBJ2.
+
+2010-10-13  Juanma Barranquero  <lekktu@gmail.com>
+
         * emacs.c (Vdynamic_library_alist)
         (syms_of_emacs) <dynamic-library-alist>: Move from image.c and rename.
         Doc fix.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 4d30bacf9a2..21bdeb8443f 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -37,7 +37,7 @@ TEMACS          = $(BLD)/temacs.exe
 TEMACS_TMP      = $(BLD)/temacs.bin
 TLIB0           = $(BLD)/temacs0.$(A)
 TLIB1           = $(BLD)/temacs1.$(A)
-TLIBW32         = $(BLD)/temacw32.$(A)
+TLIB2           = $(BLD)/temacs2.$(A)
 TOBJ            = $(BLD)/firstfile.$(O)
 TRES            = $(BLD)/emacs.res
 TLASTLIB        = $(BLD)/lastfile.$(A)
@@ -94,8 +94,9 @@ OBJ1 =  $(BLD)/alloc.$(O)		\
         $(BLD)/scroll.$(O)              \
         $(BLD)/search.$(O)              \
         $(BLD)/sound.$(O)               \
-        $(BLD)/syntax.$(O)              \
-        $(BLD)/sysdep.$(O)              \
+        $(BLD)/syntax.$(O)
+
+OBJ2 =  $(BLD)/sysdep.$(O)              \
         $(BLD)/term.$(O)                \
         $(BLD)/tparam.$(O)              \
         $(BLD)/undo.$(O)                \
@@ -125,28 +126,27 @@ OBJ1 =  $(BLD)/alloc.$(O)		\
         $(BLD)/fringe.$(O)              \
         $(BLD)/image.$(O)               \
         $(BLD)/terminal.$(O)            \
-        $(BLD)/menu.$(O)
-
-WIN32OBJ = $(BLD)/w32term.$(O)          \
-           $(BLD)/w32xfns.$(O)          \
-           $(BLD)/w32fns.$(O)           \
-           $(BLD)/xfaces.$(O)           \
-           $(BLD)/w32select.$(O)        \
-           $(BLD)/w32menu.$(O)          \
-           $(BLD)/w32reg.$(O)
-
-FONTOBJ = $(BLD)/w32font.$(O) $(BLD)/w32uniscribe.$(O)
+        $(BLD)/menu.$(O)                \
+        $(BLD)/w32term.$(O)             \
+        $(BLD)/w32xfns.$(O)             \
+        $(BLD)/w32fns.$(O)              \
+        $(BLD)/xfaces.$(O)              \
+        $(BLD)/w32select.$(O)           \
+        $(BLD)/w32menu.$(O)             \
+        $(BLD)/w32reg.$(O)              \
+        $(BLD)/w32font.$(O)             \
+        $(BLD)/w32uniscribe.$(O)
 
 LIBS =  $(TLIB0)        \
         $(TLIB1)        \
-        $(TLIBW32)      \
+        $(TLIB2)        \
         $(TLASTLIB)     \
         $(WINMM)        \
         $(ADVAPI32)     \
         $(GDI32)        \
         $(COMDLG32)     \
         $(USER32)       \
-        $(MPR)  \
+        $(MPR)          \
         $(SHELL32)      \
         $(WINSPOOL)     \
         $(OLE32)        \
@@ -174,7 +174,7 @@ $(EMACS):       $(DOC) $(TEMACS)
 # (it is the preload heap size in MB).
 #
 temacs:         stamp_BLD $(TEMACS)
-$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \
+$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
                   ../nt/$(BLD)/addsection.exe
         $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
         "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
@@ -190,16 +190,14 @@ make-buildobj-CMD:
         echo #define BUILDOBJ ^"\> buildobj.h
         echo $(OBJ0)            \>> buildobj.h
         echo $(OBJ1)            \>> buildobj.h
-        echo $(WIN32OBJ)        \>> buildobj.h
-        echo $(FONTOBJ)         \>> buildobj.h
+        echo $(OBJ2)            \>> buildobj.h
         echo ^">> buildobj.h
 
 make-buildobj-SH:
         echo '#define BUILDOBJ $(DQUOTE)\'  > buildobj.h
         echo $(OBJ0)                   '\' >> buildobj.h
         echo $(OBJ1)                   '\' >> buildobj.h
-        echo $(WIN32OBJ)               '\' >> buildobj.h
-        echo $(FONTOBJ)                '\' >> buildobj.h
+        echo $(OBJ2)                   '\' >> buildobj.h
         echo '$(DQUOTE)'                   >> buildobj.h
 
 bootstrap: bootstrap-emacs
@@ -249,7 +247,7 @@ $(TLIB0):       $(OBJ0)
 $(TLIB1):       $(OBJ1)
         - $(DEL) $@
         $(AR) $(AR_OUT)$@ $(ALL_DEPS)
-$(TLIBW32):     $(WIN32OBJ) $(FONTOBJ)
+$(TLIB2):       $(OBJ2)
         - $(DEL) $@
         $(AR) $(AR_OUT)$@ $(ALL_DEPS)
 
@@ -298,10 +296,10 @@ cleanall:	clean
 ##
 ## This works only with GNU Make.
 
-TAGS: $(OBJ0) $(OBJ1) $(WIN32OBJ) $(FONTOBJ)
+TAGS: $(OBJ0) $(OBJ1) $(OBJ2)
         $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
 
-TAGS-LISP: $(OBJ0) $(OBJ1) $(WIN32OBJ) $(FONTOBJ)
+TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
         $(MAKE) $(MFLAGS) TAGS-LISP-$(MAKETYPE)
 
 TAGS-gmake:
@@ -311,8 +309,7 @@ TAGS-gmake:
         ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
           $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
         ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(WIN32OBJ)) \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(FONTOBJ)) \
+          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2)) \
           $(CURDIR)/*.h
 
 TAGS-nmake:
@@ -1752,4 +1749,4 @@ $(BLD)/w32uniscribe.$(O) : \
 # Each object file depends on stamp_BLD, because in parallel builds we must
 # make sure $(BLD) exists before starting compilations.
 #
-$(OBJ0) $(OBJ1) $(WIN32OBJ) $(FONTOBJ) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD
+$(OBJ0) $(OBJ1) $(OBJ2) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD