X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/8519232d51327515d031273376410441fc5d0280..ab422c4d6899b1442cb6954c1829c1fb656b006c:/lib-src/makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 65e2f7cae2..51fac61cb2 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -23,8 +23,7 @@ ALL = $(BLD)/test-distrib.exe $(BLD)/make-docfile.exe $(BLD)/hexl.exe\
 
 .PHONY: make-docfile
 
-LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
-		  -DNO_ARCHIVES=1 -I../lib \
+LOCAL_FLAGS	= -DNO_LDAV=1 -DNO_ARCHIVES=1 -I../lib \
 		  -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS 		= $(BASE_LIBS) $(ADVAPI32)
@@ -125,7 +124,7 @@ $(BLD)/profile.exe:	$(PROFILEOBJS)
 obj =   dosfns.o msdos.o \
 	xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
 	fontset.o menu.o \
-	w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
+	w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \
 	w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
 	font.o w32font.o w32uniscribe.o \
 	dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
@@ -141,7 +140,7 @@ obj =   dosfns.o msdos.o \
 	process.o callproc.o unexw32.o \
 	region-cache.o sound.o atimer.o \
 	doprnt.o intervals.o textprop.o composite.o \
-	gnutls.o xml.o
+	gnutls.o xml.o profiler.o
 
 #
 # These are the lisp files that are loaded up in loadup.el
@@ -210,38 +209,40 @@ lisp1= \
 	$(lispsource)emacs-lisp/map-ynp.elc \
 	$(lispsource)menu-bar.elc \
 	$(lispsource)international/mule.elc \
-	$(lispsource)international/mule-conf.el \
+	$(lispsource)international/mule-conf.elc \
 	$(lispsource)international/mule-cmds.elc \
 	$(lispsource)international/characters.elc \
 	$(lispsource)international/charprop.el \
 	$(lispsource)case-table.elc
 
 lisp2 = \
-	$(lispsource)language/chinese.el \
-	$(lispsource)language/cyrillic.el \
-	$(lispsource)language/indian.el \
-	$(lispsource)language/sinhala.el \
-	$(lispsource)language/english.el \
+	$(lispsource)language/chinese.elc \
+	$(lispsource)language/cyrillic.elc \
+	$(lispsource)language/indian.elc \
+	$(lispsource)language/sinhala.elc \
+	$(lispsource)language/english.elc \
 	$(lispsource)language/ethiopic.elc \
 	$(lispsource)language/european.elc \
-	$(lispsource)language/czech.el \
-	$(lispsource)language/slovak.el \
-	$(lispsource)language/romanian.el \
-	$(lispsource)language/greek.el \
+	$(lispsource)language/czech.elc \
+	$(lispsource)language/slovak.elc \
+	$(lispsource)language/romanian.elc \
+	$(lispsource)language/greek.elc \
 	$(lispsource)language/hebrew.elc \
-	$(lispsource)language/japanese.el \
-	$(lispsource)language/korean.el \
-	$(lispsource)language/lao.el \
-	$(lispsource)language/cham.el \
-	$(lispsource)language/tai-viet.el \
-	$(lispsource)language/thai.el \
+	$(lispsource)language/japanese.elc \
+	$(lispsource)international/cp51932.el \
+	$(lispsource)international/eucjp-ms.el \
+	$(lispsource)language/korean.elc \
+	$(lispsource)language/lao.elc \
+	$(lispsource)language/cham.elc \
+	$(lispsource)language/tai-viet.elc \
+	$(lispsource)language/thai.elc \
 	$(lispsource)language/tibetan.elc \
-	$(lispsource)language/vietnamese.el \
-	$(lispsource)language/misc-lang.el \
-	$(lispsource)language/utf-8-lang.el \
-	$(lispsource)language/georgian.el \
-	$(lispsource)language/khmer.el \
-	$(lispsource)language/burmese.el \
+	$(lispsource)language/vietnamese.elc \
+	$(lispsource)language/misc-lang.elc \
+	$(lispsource)language/utf-8-lang.elc \
+	$(lispsource)language/georgian.elc \
+	$(lispsource)language/khmer.elc \
+	$(lispsource)language/burmese.elc \
 	$(lispsource)register.elc \
 	$(lispsource)replace.elc \
 	$(lispsource)simple.elc \
@@ -267,7 +268,7 @@ lisp2 = \
 	$(WINDOW_SUPPORT) \
 	$(lispsource)widget.elc \
 	$(lispsource)window.elc \
-	$(lispsource)version.el
+	$(lispsource)version.elc
 
 # This is needed the first time we build the tree, since temacs.exe
 # does not exist yet, and the DOC rule needs it to rebuild DOC whenever
@@ -360,10 +361,12 @@ SRC		= $(EMACS_ROOT)/src
 NT_INC		= $(EMACS_ROOT)/nt/inc
 GNU_LIB		= $(EMACS_ROOT)/lib
 
-MS_W32_H       = $(SRC)/s/ms-w32.h \
+MS_W32_H       = $(NT_INC)/ms-w32.h \
 		 $(NT_INC)/sys/stat.h
-CONFIG_H       = $(SRC)/config.h \
+CONF_POST_H    = $(SRC)/conf_post.h \
 		 $(MS_W32_H)
+CONFIG_H       = $(SRC)/config.h \
+		 $(CONF_POST_H)
 INTTYPES_H     = $(NT_INC)/inttypes.h \
 		 $(NT_INC)/stdint.h
 NTLIB_H        = $(LIB_SRC)/ntlib.h \
@@ -450,6 +453,7 @@ $(BLD)/profile.$(O) : \
 $(BLD)/regex.$(O) : \
 	$(SRC)/regex.c \
 	$(SRC)/regex.h \
+	$(NT_INC)/stdbool.h \
 	$(NT_INC)/unistd.h \
 	$(CONFIG_H)