X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2912322b80f7db17e3aefd58884056f99f1024e6..ac1a0ce1c6ba60a3faddc64463cb7a697b9d8fd2:/lib-src/makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 14130d2e52..fea1d29592 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,6 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-#   2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -18,61 +17,42 @@
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
-ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacsclient
+ALL = $(BLD)/test-distrib.exe $(BLD)/make-docfile.exe $(BLD)/hexl.exe\
+ $(BLD)/ctags.exe $(BLD)/etags.exe $(BLD)/movemail.exe $(BLD)/ebrowse.exe\
+ $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
 
-.PHONY: $(ALL)
+.PHONY: make-docfile
 
-VERSION		= 24.0.50
-
-LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
-		  -I../src
+LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
+		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \
+		  -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS 		= $(BASE_LIBS) $(ADVAPI32)
 
+# The following target is used by makefile.w32-in files in other directories.
+make-docfile:	$(BLD)/make-docfile.exe
+
 $(BLD)/make-docfile.exe: 	$(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O) $(LIBS)
 $(BLD)/hexl.exe:		$(BLD)/hexl.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS)
-$(BLD)/fakemail.exe: 		$(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O)
-		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LIBS)
-$(BLD)/sorted-doc.exe: 	$(BLD)/sorted-doc.$(O)
-		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/sorted-doc.$(O) $(LIBS)
-$(BLD)/digest-doc.exe: 	$(BLD)/digest-doc.$(O)
-		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/digest-doc.$(O) $(LIBS)
 $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
+		"$(BLD)/test-distrib.exe" "$(SRC)/testfile"
 
-make-docfile:	stamp_BLD $(BLD)/make-docfile.exe
-ctags:		stamp_BLD $(BLD)/ctags.exe
-etags:		stamp_BLD $(BLD)/etags.exe
-ebrowse:        stamp_BLD $(BLD)/ebrowse.exe
-hexl:		stamp_BLD $(BLD)/hexl.exe
-movemail:	stamp_BLD $(BLD)/movemail.exe
-fakemail:	stamp_BLD $(BLD)/fakemail.exe
-sorted-doc:	stamp_BLD $(BLD)/sorted-doc.exe
-digest-doc:	stamp_BLD $(BLD)/digest-doc.exe
-emacsclient:	stamp_BLD $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
-
-test-distrib:	stamp_BLD $(BLD)/test-distrib.exe
-	"$(BLD)/test-distrib.exe" "$(SRC)/testfile"
-
-GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O)
-GETOPTDEPS = $(GETOPTOBJS) getopt.h
 MOVEMAILOBJS =  $(BLD)/movemail.$(O) \
 		$(BLD)/pop.$(O) \
-		$(BLD)/ntlib.$(O) \
-		$(GETOPTOBJS)
+		../lib/$(BLD)/libgnu.$(A) \
+		$(BLD)/ntlib.$(O)
 
-$(BLD)/movemail.exe:	$(MOVEMAILOBJS) getopt.h
+$(BLD)/movemail.exe:	$(MOVEMAILOBJS) ../lib/getopt.h
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS)
 
-ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\""
+ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR
 ECLIENTOBJS =	$(BLD)/emacsclient.$(O) \
-		$(BLD)/getopt.$(O) \
-		$(BLD)/getopt1.$(O) \
-		$(BLD)/ntlib.$(O)
+		$(BLD)/ntlib.$(O) \
+		../lib/$(BLD)/libgnu.$(A)
 CLIENTRES =	../nt/$(BLD)/emacsclient.res
 
 $(CLIENTRES):	../nt/emacsclient.rc
@@ -85,16 +65,13 @@ $(BLD)/emacsclient.exe:		$(ECLIENTOBJS)
 
 $(BLD)/emacsclientw.exe:	$(ECLIENTOBJS) $(CLIENTRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-		$(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
+		$(LINK) $(LINK_OUT)$@ $(CLIENTRES) $(MWINDOWS) $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
 
-# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
-# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.
-$(BLD)/emacsclient.$(O):	emacsclient.c makefile.w32-in
+$(BLD)/emacsclient.$(O):	emacsclient.c
 		$(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
 
 ETAGSOBJ      = $(BLD)/etags.$(O) \
-		$(BLD)/getopt.$(O) \
-		$(BLD)/getopt1.$(O) \
+		../lib/$(BLD)/libgnu.$(A) \
 		$(BLD)/ntlib.$(O) \
 		$(BLD)/regex.$(O)
 
@@ -103,8 +80,7 @@ $(BLD)/etags.exe: 	$(ETAGSOBJ)
 
 
 EBROWSEOBJ    = $(BLD)/ebrowse.$(O) \
-		$(BLD)/getopt.$(O) \
-		$(BLD)/getopt1.$(O) \
+		../lib/$(BLD)/libgnu.$(A) \
 		$(BLD)/ntlib.$(O)
 
 $(BLD)/ebrowse.exe:     $(EBROWSEOBJ)
@@ -114,13 +90,12 @@ $(BLD)/regex.$(O): ../src/regex.c ../src/regex.h ../src/config.h
 		$(CC)  $(CFLAGS) -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
 		../src/regex.c $(CC_OUT)$@
 
-ETAGS_CFLAGS  = -DHAVE_GETCWD
+ETAGS_CFLAGS  = -DHAVE_GETCWD -DEMACS_NAME="\"GNU Emacs\""
 $(BLD)/etags.$(O): etags.c
 		$(CC) $(CFLAGS) $(ETAGS_CFLAGS) $(CC_OUT)$@ etags.c
 
 CTAGSOBJ      = $(BLD)/ctags.$(O) \
-		$(BLD)/getopt.$(O) \
-		$(BLD)/getopt1.$(O) \
+		../lib/$(BLD)/libgnu.$(A) \
 		$(BLD)/ntlib.$(O) \
 		$(BLD)/regex.$(O)
 
@@ -131,7 +106,7 @@ ctags.c:	etags.c
 		- $(DEL) ctags.c
 		$(CP) etags.c ctags.c
 
-CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS)
+CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS) -DEMACS_NAME="\"GNU Emacs\""
 $(BLD)/ctags.$(O): ctags.c
 		$(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c
 
@@ -143,23 +118,24 @@ $(BLD)/ctags.$(O): ctags.c
 #
 obj =   dosfns.o msdos.o \
 	xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
-	fontset.o \
+	fontset.o menu.o \
 	w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
 	w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
-	font.o w32font.o \
-	dispnew.o frame.o scroll.o xdisp.o window.o \
+	font.o w32font.o w32uniscribe.o \
+	dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
 	charset.o coding.o category.o ccl.o character.o chartab.o \
 	cm.o term.o terminal.o xfaces.o \
 	emacs.o keyboard.o macros.o keymap.o sysdep.o \
 	buffer.o filelock.o insdel.o marker.o \
-	minibuf.o fileio.o dired.o filemode.o \
+	minibuf.o fileio.o dired.o \
 	cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
 	alloc.o data.o doc.o editfns.o callint.o \
 	eval.o floatfns.o fns.o print.o lread.o \
 	syntax.o bytecode.o \
-	process.o callproc.o \
+	process.o callproc.o unexw32.o \
 	region-cache.o sound.o atimer.o \
-	doprnt.o strftime.o intervals.o textprop.o composite.o md5.o
+	doprnt.o intervals.o textprop.o composite.o \
+	gnutls.o xml.o
 
 #
 # These are the lisp files that are loaded up in loadup.el
@@ -195,8 +171,7 @@ OTHER_PLATFORM_SUPPORT = \
 	$(lispsource)term/pc-win.elc \
 	$(lispsource)x-dnd.elc \
 	$(lispsource)term/x-win.elc \
-	${lispsource}emacs-lisp/easymenu.elc \
-	${lispsource}term/ns-win.elc
+	$(lispsource)term/ns-win.elc
 
 
 lisp1= \
@@ -247,7 +222,7 @@ lisp2 = \
 	$(lispsource)language/slovak.el \
 	$(lispsource)language/romanian.el \
 	$(lispsource)language/greek.el \
-	$(lispsource)language/hebrew.el \
+	$(lispsource)language/hebrew.elc \
 	$(lispsource)language/japanese.el \
 	$(lispsource)language/korean.el \
 	$(lispsource)language/lao.el \
@@ -279,8 +254,8 @@ lisp2 = \
 	$(lispsource)textmodes/text-mode.elc \
 	$(lispsource)emacs-lisp/timer.elc \
 	$(lispsource)jka-cmpr-hook.elc \
-	$(lispsource)vc-hooks.elc \
-	$(lispsource)ediff-hook.elc \
+	$(lispsource)vc/vc-hooks.elc \
+	$(lispsource)vc/ediff-hook.elc \
 	$(lispsource)epa-hook.elc \
 	$(TOOLTIP_SUPPORT) \
 	$(WINNT_SUPPORT) \
@@ -289,11 +264,6 @@ lisp2 = \
 	$(lispsource)window.elc \
 	$(lispsource)version.el
 
-# Used by batch-update-autoloads.
-echolisp:
-	@echo $(lisp1)
-	@echo $(lisp2)
-
 # 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
 # Emacs is rebuilt.
@@ -322,7 +292,7 @@ $(DOC):		stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(l
 #
 # Build the executables
 #
-all:		stamp_BLD $(ALL) $(DOC)
+all:		$(ALL) $(DOC)
 
 #
 # Assuming INSTALL_DIR is defined, build and install emacs in it.
@@ -335,8 +305,6 @@ install:	$(INSTALL_FILES)
 		$(CP) $(BLD)/ctags.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/hexl.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin
-		$(CP) $(BLD)/sorted-doc.exe $(INSTALL_DIR)/bin
-		$(CP) $(BLD)/digest-doc.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/emacsclient.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/emacsclientw.exe $(INSTALL_DIR)/bin
 		- mkdir "$(INSTALL_DIR)/etc"
@@ -350,10 +318,8 @@ install:	$(INSTALL_FILES)
 clean:
 		- $(DEL) DOC* $(COMPILER_TEMP_FILES)
 		- $(DEL) ctags.c
-		- $(DEL) getopt.h
 		- $(DEL_TREE) $(OBJDIR)
 		- $(DEL) stamp_BLD
-		- $(DEL) echolisp.tmp
 
 distclean: cleanall
 	- $(DEL) TAGS
@@ -371,11 +337,14 @@ cleanall:	clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:	../nt/$(CONFIG_H)
+			$(DEL) $@
 			echo $(CONFIG_H) has changed.  Re-run configure.bat.
 			exit -1
 
-getopt.h:		getopt_.h
-			$(CP) $(ALL_DEPS) $@
+### TAGS ###
+
+TAGS: $(BLD)/etags.exe *.c *.h
+	$(BLD)/etags.exe *.c *.h
 
 ### DEPENDENCIES ###
 
@@ -385,92 +354,52 @@ SRC		= .
 $(BLD)/alloca.$(O) : \
 	$(SRC)/alloca.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(EMACS_ROOT)/src/blockinput.h
 
-$(BLD)/b2m.$(O) : \
-	$(SRC)/b2m.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/lib-src/../src/config.h
-
 $(BLD)/ctags.$(O) : \
 	$(SRC)/ctags.c \
 	$(EMACS_ROOT)/nt/inc/sys/param.h \
+	$(EMACS_ROOT)/nt/inc/sys/stat.h \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/lib-src/../src/config.h \
 	$(SRC)/ntlib.h \
-	$(SRC)/getopt.h
+	$(EMACS_ROOT)/lib/getopt.h
 
-$(BLD)/digest-doc.$(O) : \
-	$(SRC)/digest-doc.c
+$(BLD)/ebrowse.$(O) : \
+	$(SRC)/ebrowse.c \
+	$(EMACS_ROOT)/lib/min-max.h \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h
 
 $(BLD)/emacsclient.$(O) : \
 	$(SRC)/emacsclient.c \
+	$(EMACS_ROOT)/nt/inc/sys/stat.h \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/lib-src/../src/config.h
 
 $(BLD)/etags.$(O) : \
 	$(SRC)/etags.c \
 	$(EMACS_ROOT)/nt/inc/sys/param.h \
+	$(EMACS_ROOT)/nt/inc/sys/stat.h \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/lib-src/../src/config.h \
 	$(SRC)/ntlib.h \
-	$(SRC)/getopt.h
-
-$(BLD)/fakemail.$(O) : \
-	$(SRC)/fakemail.c \
-	$(SRC)/ntlib.h \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/lib-src/../src/config.h \
-	$(EMACS_ROOT)/nt/inc/pwd.h
-
-$(BLD)/getdate.$(O) : \
-	$(SRC)/getdate.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/src/config.h \
-	$(MSTOOLS_SYS)/types.h
-
-$(BLD)/getopt.$(O) : \
-	$(SRC)/getopt.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/src/config.h \
-	$(SRC)/ntlib.h \
-	$(SRC)/getopt.h
-
-$(BLD)/getopt1.$(O) : \
-	$(SRC)/getopt1.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/src/config.h \
-	$(SRC)/getopt.h
+	$(EMACS_ROOT)/lib/getopt.h
 
 $(BLD)/hexl.$(O) : \
 	$(SRC)/hexl.c
 
-$(BLD)/leditcfns.$(O) : \
-	$(SRC)/leditcfns.c
-
 $(BLD)/make-docfile.$(O) : \
 	$(SRC)/make-docfile.c \
 	$(EMACS_ROOT)/src/config.h
 
-$(BLD)/make-path.$(O) : \
-	$(SRC)/make-path.c
-
 $(BLD)/movemail.$(O) : \
 	$(SRC)/movemail.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/lib-src/../src/config.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
+	$(EMACS_ROOT)/nt/inc/sys/stat.h \
 	$(EMACS_ROOT)/lib-src/../src/syswait.h \
 	$(EMACS_ROOT)/nt/inc/pwd.h \
 	$(SRC)/ntlib.h
@@ -479,49 +408,33 @@ $(BLD)/movemail.$(O) : \
 $(BLD)/ntlib.$(O) : \
 	$(SRC)/ntlib.c \
 	$(SRC)/ntlib.h \
+	$(EMACS_ROOT)/nt/inc/sys/stat.h \
 	$(EMACS_ROOT)/nt/inc/pwd.h
 
 $(BLD)/pop.$(O) : \
 	$(SRC)/pop.c \
 	$(SRC)/pop.h \
+	$(EMACS_ROOT)/lib/min-max.h \
 	$(SRC)/ntlib.h
 
 $(BLD)/profile.$(O) : \
 	$(SRC)/profile.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/lib-src/../src/config.h \
 	$(EMACS_ROOT)/lib-src/../src/systime.h
 
-$(BLD)/qsort.$(O) : \
-	$(SRC)/qsort.c
-
-$(BLD)/sorted-doc.$(O) : \
-	$(SRC)/sorted-doc.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/src/config.h
-
 $(BLD)/tcp.$(O) : \
 	$(SRC)/tcp.c
 
 $(BLD)/test-distrib.$(O) : \
 	$(SRC)/test-distrib.c
 
-$(BLD)/timer.$(O) : \
-	$(SRC)/timer.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/lib-src/../src/config.h
-
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
 #
-$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O): stamp_BLD
-
-$(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O): stamp_BLD
+$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O): stamp_BLD
 
-$(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS): stamp_BLD
+$(BLD)/test-distrib.$(O) $(MOVEMAILOBJS): stamp_BLD
 
 $(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O): stamp_BLD