Merge from trunk.

[bpt/emacs.git] / lib-src / makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 77931c1..28f913a 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -21,7 +21,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse emacsclient
 
 .PHONY: $(ALL)
 
-LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
+LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
                  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \
                  -I../nt/inc -I../src
 
@@ -31,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)
 
@@ -42,7 +40,6 @@ 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
@@ -135,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 intervals.o textprop.o composite.o
+       doprnt.o intervals.o textprop.o composite.o \
+       gnutls.o
 
 #
 # These are the lisp files that are loaded up in loadup.el
@@ -271,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.
@@ -332,7 +325,6 @@ clean:
                - $(DEL) ctags.c
                - $(DEL_TREE) $(OBJDIR)
                - $(DEL) stamp_BLD
-               - $(DEL) echolisp.tmp
 
 distclean: cleanall
        - $(DEL) TAGS
@@ -374,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 \
        $(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
@@ -389,20 +390,13 @@ $(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 \
        $(EMACS_ROOT)/lib/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 \
@@ -429,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
@@ -437,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) : \
@@ -469,7 +466,7 @@ $(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) $(MOVEMAILOBJS): stamp_BLD