X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d52969e8afaa19ed1acc01f4ff0bb651bf7869a7..1dc4aa6d975c9f92cd5c0d0baf5eae89e013fd67:/lib-src/makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 3ef08982ec..28f913a4df 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, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2000-2011 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -22,11 +21,9 @@ ALL = make-docfile hexl ctags etags movemail ebrowse emacsclient
 
 .PHONY: $(ALL)
 
-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
 
 LIBS 		= $(BASE_LIBS) $(ADVAPI32)
 
@@ -34,8 +31,6 @@ $(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)/test-distrib.exe: $(BLD)/test-distrib.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
 
@@ -45,28 +40,24 @@ 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
 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
@@ -81,14 +72,11 @@ $(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)
 
-# 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)
 
@@ -97,8 +85,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)
@@ -108,13 +95,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)
 
@@ -125,7 +111,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
 
@@ -146,14 +132,15 @@ obj =   dosfns.o msdos.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 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
 
 #
 # These are the lisp files that are loaded up in loadup.el
@@ -282,11 +269,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.
@@ -341,10 +323,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
@@ -366,9 +346,6 @@ cleanall:	clean
 			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
@@ -389,14 +366,23 @@ $(BLD)/alloca.$(O) : \
 $(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)/ebrowse.$(O) : \
+	$(SRC)/ebrowse.c \
+	$(EMACS_ROOT)/lib/min-max.h \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.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
@@ -404,19 +390,12 @@ $(BLD)/emacsclient.$(O) : \
 $(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
+	$(EMACS_ROOT)/lib/getopt.h
 
 $(BLD)/getdate.$(O) : \
 	$(SRC)/getdate.c \
@@ -425,21 +404,6 @@ $(BLD)/getdate.$(O) : \
 	$(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
-
 $(BLD)/hexl.$(O) : \
 	$(SRC)/hexl.c
 
@@ -459,6 +423,7 @@ $(BLD)/movemail.$(O) : \
 	$(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
@@ -467,11 +432,13 @@ $(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) : \
@@ -499,9 +466,9 @@ $(BLD)/timer.$(O) : \
 # 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)/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