HCoop / bpt / emacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(scan_lists): Follow coding convention.
[bpt/emacs.git] / src / makefile.w32-in
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index df42d0a..1c12afa 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006, 2007 Free Software Foundation, Inc.
+#                2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -45,7 +45,7 @@ TLASTLIB      = $(BLD)/lastfile.$(A)
 
 DOC            = $(OBJDIR)/etc/DOC-X
 
-FULL_LINK_FLAGS      = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
+FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 
 #
 # Split up the objects into two sets so that we don't run out of
@@ -56,43 +56,42 @@ FULL_LINK_FLAGS      = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 #
 OBJ0 =  $(BLD)/emacs.$(O)
 
-OBJ1 =  $(BLD)/abbrev.$(O)                     \
-       $(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)                      \
@@ -100,47 +99,48 @@ OBJ1 =  $(BLD)/abbrev.$(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)/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,10 +152,11 @@ LIBS =  $(TLIB0)  \
        $(GDI32)        \
        $(COMDLG32)     \
        $(USER32)       \
-       $(MPR)          \
+       $(MPR)  \
        $(SHELL32)      \
        $(WINSPOOL)     \
        $(OLE32)        \
+       $(COMCTL32)     \
        $(libc)
 
 #
@@ -181,7 +182,7 @@ temacs:         stamp_BLD $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(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 20
+       "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
        echo $(OBJ0) > $(BLD)/buildobj.lst
        echo $(OBJ1) >> $(BLD)/buildobj.lst
        echo $(WIN32OBJ) >> $(BLD)/buildobj.lst
@@ -393,6 +394,8 @@ $(BLD)/callproc.$(O) : \
        $(SRC)/process.h \
        $(SRC)/syssignal.h \
        $(SRC)/systty.h \
+       $(SRC)/frame.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32.h
 
 $(BLD)/casefiddle.$(O) : \
@@ -508,6 +511,8 @@ $(BLD)/coding.$(O) : \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
+       $(SRC)/frame.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
@@ -537,7 +542,8 @@ $(BLD)/data.$(O) : \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/puresize.h \
-       $(SRC)/syssignal.h
+       $(SRC)/syssignal.h \
+       $(SRC)/termhooks.h
 
 $(BLD)/dired.$(O) : \
        $(SRC)/dired.c \
@@ -748,6 +754,7 @@ $(BLD)/fns.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/md5.h \
        $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
@@ -779,6 +786,7 @@ $(BLD)/fontset.$(O) : \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
@@ -799,6 +807,7 @@ $(BLD)/frame.$(O) : \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
+       $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
@@ -972,6 +981,7 @@ $(BLD)/lread.$(O) : \
        $(EMACS_ROOT)/src/config.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
        $(EMACS_ROOT)/src/epaths.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/ccl.h \
        $(SRC)/character.h \
@@ -1029,6 +1039,7 @@ $(BLD)/minibuf.$(O) : \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
@@ -1195,6 +1206,7 @@ $(BLD)/scroll.$(O) : \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
@@ -1263,6 +1275,7 @@ $(BLD)/sysdep.$(O) : \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/cm.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
@@ -1309,6 +1322,18 @@ $(BLD)/termcap.$(O) : \
        $(EMACS_ROOT)/src/config.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h
 
+$(BLD)/terminal.$(O) : \
+       $(SRC)/terminal.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/termchar.h \
+       $(SRC)/termhooks.h
+
 $(BLD)/textprop.$(O) : \
        $(SRC)/textprop.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
@@ -1426,6 +1451,8 @@ $(BLD)/xfaces.$(O): \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
+       $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
@@ -1594,6 +1621,7 @@ $(BLD)/w32font$(O): \
        $(SRC)/font.h \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
+       $(SRC)/w32font.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h
 
Unnamed repository; edit this file 'description' to name the repository.