From ffe421835cf906463e3f399397a60e70d9891352 Mon Sep 17 00:00:00 2001
From: Jason Rumney <jasonr@gnu.org>
Date: Sun, 3 Feb 2008 21:33:49 +0000
Subject: [PATCH] (OBJ1): Include font.o here. (FONTOBJ) [USE_FONTBACKEND]:
 Instead of here.

---
 src/ChangeLog       |  5 +++
 src/makefile.w32-in | 92 ++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f663cd20c8..30e62212cab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-03  Jason Rumney  <jasonr@gnu.org>
+
+	* makefile.w32-in (OBJ1): Include font.o here.
+	(FONTOBJ) [USE_FONTBACKEND]: Instead of here.
+
 2008-02-02  Jason Rumney  <jasonr@gnu.org>
 
 	* makefile.w32-in (temacs): Bump EMHEAP to 21.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 7b3ba3cfd69..1c12afa0168 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -56,42 +56,42 @@ FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 #
 OBJ0 =  $(BLD)/emacs.$(O)
 
-OBJ1 =  $(BLD)/alloc.$(O)			\
+OBJ1 =  $(BLD)/alloc.$(O)		\
 	$(BLD)/atimer.$(O)			\
 	$(BLD)/buffer.$(O)			\
-	$(BLD)/bytecode.$(O)			\
-	$(BLD)/callint.$(O)			\
-	$(BLD)/callproc.$(O)			\
-	$(BLD)/casefiddle.$(O)			\
-	$(BLD)/cm.$(O)				\
+	$(BLD)/bytecode.$(O)		\
+	$(BLD)/callint.$(O)		\
+	$(BLD)/callproc.$(O)		\
+	$(BLD)/casefiddle.$(O)		\
+	$(BLD)/cm.$(O)			\
 	$(BLD)/cmds.$(O)			\
 	$(BLD)/data.$(O)			\
 	$(BLD)/dired.$(O)			\
-	$(BLD)/dispnew.$(O)			\
-	$(BLD)/doc.$(O)				\
+	$(BLD)/dispnew.$(O)		\
+	$(BLD)/doc.$(O)			\
 	$(BLD)/doprnt.$(O)			\
-	$(BLD)/editfns.$(O)			\
+	$(BLD)/editfns.$(O)		\
 	$(BLD)/eval.$(O)			\
 	$(BLD)/fileio.$(O)			\
-	$(BLD)/filelock.$(O)			\
-	$(BLD)/filemode.$(O)			\
-	$(BLD)/fns.$(O)				\
+	$(BLD)/filelock.$(O)		\
+	$(BLD)/filemode.$(O)		\
+	$(BLD)/fns.$(O)			\
 	$(BLD)/indent.$(O)			\
 	$(BLD)/insdel.$(O)			\
-	$(BLD)/keyboard.$(O)			\
+	$(BLD)/keyboard.$(O)		\
 	$(BLD)/keymap.$(O)			\
 	$(BLD)/lread.$(O)			\
 	$(BLD)/macros.$(O)			\
 	$(BLD)/marker.$(O)			\
-	$(BLD)/md5.$(O)                         \
-	$(BLD)/minibuf.$(O)			\
-	$(BLD)/w32.$(O)				\
-	$(BLD)/w32heap.$(O)			\
-	$(BLD)/w32inevt.$(O)			\
-	$(BLD)/w32proc.$(O)			\
-	$(BLD)/w32console.$(O)			\
+	$(BLD)/md5.$(O)                 \
+	$(BLD)/minibuf.$(O)		\
+	$(BLD)/w32.$(O)			\
+	$(BLD)/w32heap.$(O)		\
+	$(BLD)/w32inevt.$(O)		\
+	$(BLD)/w32proc.$(O)		\
+	$(BLD)/w32console.$(O)		\
 	$(BLD)/print.$(O)			\
-	$(BLD)/process.$(O)			\
+	$(BLD)/process.$(O)		\
 	$(BLD)/regex.$(O)			\
 	$(BLD)/scroll.$(O)			\
 	$(BLD)/search.$(O)			\
@@ -99,48 +99,48 @@ OBJ1 =  $(BLD)/alloc.$(O)			\
 	$(BLD)/syntax.$(O)			\
 	$(BLD)/sysdep.$(O)			\
 	$(BLD)/term.$(O)			\
-	$(BLD)/termcap.$(O)			\
+	$(BLD)/termcap.$(O)		\
 	$(BLD)/tparam.$(O)			\
 	$(BLD)/undo.$(O)			\
-	$(BLD)/unexw32.$(O)			\
+	$(BLD)/unexw32.$(O)		\
 	$(BLD)/window.$(O)			\
 	$(BLD)/xdisp.$(O)			\
-	$(BLD)/casetab.$(O)			\
-	$(BLD)/floatfns.$(O)			\
+	$(BLD)/casetab.$(O)		\
+	$(BLD)/floatfns.$(O)		\
 	$(BLD)/frame.$(O)			\
-	$(BLD)/gmalloc.$(O)			\
-	$(BLD)/intervals.$(O)			\
-	$(BLD)/composite.$(O)			\
+	$(BLD)/gmalloc.$(O)		\
+	$(BLD)/intervals.$(O)		\
+	$(BLD)/composite.$(O)		\
 	$(BLD)/ralloc.$(O)			\
-	$(BLD)/textprop.$(O)			\
-	$(BLD)/vm-limit.$(O)			\
+	$(BLD)/textprop.$(O)		\
+	$(BLD)/vm-limit.$(O)		\
 	$(BLD)/region-cache.$(O)		\
-	$(BLD)/strftime.$(O)			\
-	$(BLD)/charset.$(O)			\
-	$(BLD)/character.$(O)			\
-	$(BLD)/chartab.$(O)			\
+	$(BLD)/strftime.$(O)		\
+	$(BLD)/charset.$(O)		\
+	$(BLD)/character.$(O)		\
+	$(BLD)/chartab.$(O)		\
 	$(BLD)/coding.$(O)			\
-	$(BLD)/category.$(O)			\
-	$(BLD)/ccl.$(O)				\
-	$(BLD)/fontset.$(O)			\
+	$(BLD)/category.$(O)		\
+	$(BLD)/ccl.$(O)			\
+	$(BLD)/font.$(O)			\
+	$(BLD)/fontset.$(O)		\
 	$(BLD)/fringe.$(O)			\
 	$(BLD)/image.$(O)			\
 	$(BLD)/terminal.$(O)
 
 
-WIN32OBJ = $(BLD)/w32term.$(O)			\
-	   $(BLD)/w32xfns.$(O)			\
-	   $(BLD)/w32fns.$(O)			\
-	   $(BLD)/xfaces.$(O)			\
+WIN32OBJ = $(BLD)/w32term.$(O)		\
+	   $(BLD)/w32xfns.$(O)		\
+	   $(BLD)/w32fns.$(O)		\
+	   $(BLD)/xfaces.$(O)		\
 	   $(BLD)/w32select.$(O)		\
-	   $(BLD)/w32menu.$(O)			\
-	   $(BLD)/w32reg.$(O)			\
+	   $(BLD)/w32menu.$(O)		\
+	   $(BLD)/w32reg.$(O)		\
 	   $(BLD)/w32bdf.$(O)
 
 FONTOBJ =
 ifdef USE_FONTBACKEND
-FONTOBJ = $(BLD)/font.$(O) \
-	  $(BLD)/w32font.$(O)
+FONTOBJ = $(BLD)/w32font.$(O)
 endif
 
 LIBS =  $(TLIB0)	\
@@ -152,7 +152,7 @@ LIBS =  $(TLIB0)	\
 	$(GDI32)	\
 	$(COMDLG32)	\
 	$(USER32)	\
-	$(MPR)		\
+	$(MPR)	\
 	$(SHELL32)	\
 	$(WINSPOOL)	\
 	$(OLE32)	\
-- 
2.39.5