X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/44874bcb326dc03a3005951a300a3032b8d17ee1..dddcbf00213d4f1c6866abfb8d9132636839a3a1:/lib-src/makefile.nt

diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index d1bda95ca7..01b392d6f9 100644
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -25,7 +25,8 @@
 #
 !include ..\nt\makefile.def
 
-LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 -DNO_ARCHIVES=1 -I..\nt\inc -I..\src
+LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
+	-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I..\nt\inc -I..\src
 
 LINK_FLAGS	= $(ARCH_LDFLAGS) -debug:PARTIAL -machine:$(ARCH) -subsystem:console -entry:mainCRTStartup setargv.obj
 
@@ -33,10 +34,11 @@ ALL	        = $(BLD)\make-docfile.exe \
 		$(BLD)\hexl.exe		\
 		$(BLD)\ctags.exe	\
 		$(BLD)\etags.exe	\
+		$(BLD)\ebrowse.exe	\
 		$(BLD)\movemail.exe	\
 		$(BLD)\fakemail.exe	\
 
-		
+
 # don't know what (if) to do with these yet...
 #
 #		$(BLD)\sorted-doc.exe	\
@@ -60,6 +62,7 @@ $(BLD)\fakemail.exe: 		$(BLD)\fakemail.obj $(BLD)\ntlib.obj
 
 make-docfile:	$(BLD) $(BLD)\make-docfile.exe
 etags:		$(BLD) $(BLD)\etags.exe
+ebrowse:	$(BLD) $(BLD)\ebrowse.exe
 hexl:		$(BLD) $(BLD)\hexl.exe
 movemail:	$(BLD) $(BLD)\movemail.exe
 fakemail:	$(BLD) $(BLD)\fakemail.exe
@@ -72,14 +75,14 @@ MOVEMAILOBJS =  $(BLD)\movemail.obj \
 		$(GETOPTOBJS)
 
 $(BLD)\movemail.exe:	$(MOVEMAILOBJS) getopt.h
-		$(LINK) -out:$@ $(LINK_FLAGS) -debug:FULL $(MOVEMAILOBJS) $(LIBS) wsock32.lib
+# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
+		$(LINK) -out:$@ $(LINK_FLAGS) -debug:FULL $(MOVEMAILOBJS) wsock32.lib $(LIBS)
 
 ETAGSOBJ      = $(BLD)\etags.obj \
 		$(BLD)\getopt.obj \
 		$(BLD)\getopt1.obj \
 		$(BLD)\ntlib.obj \
-		$(BLD)\regex.obj \
-		$(BLD)\alloca.obj
+		$(BLD)\regex.obj
 
 
 $(BLD)\etags.exe: 	$(ETAGSOBJ)
@@ -98,8 +101,7 @@ CTAGSOBJ      = $(BLD)\ctags.obj \
 		$(BLD)\getopt.obj \
 		$(BLD)\getopt1.obj \
 		$(BLD)\ntlib.obj \
-		$(BLD)\regex.obj \
-		$(BLD)\alloca.obj
+		$(BLD)\regex.obj
 
 $(BLD)\ctags.exe:           ctags.c $(CTAGSOBJ)
 		$(LINK) -out:$@ $(LINK_FLAGS) $(CTAGSOBJ) $(LIBS)
@@ -112,6 +114,16 @@ CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS)
 $(BLD)\ctags.obj: ctags.c
 		$(CC) $(CFLAGS) $(CTAGS_CFLAGS) -Fo$@ ctags.c
 
+EBROWSE_OBJ   = $(BLD)\ebrowse.obj \
+		$(BLD)\getopt.obj \
+		$(BLD)\getopt1.obj \
+		$(BLD)\ntlib.obj
+
+$(BLD)\ebrowse.exe:	$(EBROWSE_OBJ)
+		$(LINK) -out:$@ $(LINK_FLAGS) $(EBROWSE_OBJ) $(LIBS)
+
+$(BLD)\ebrowse.obj: ebrowse.c ..\src\config.h
+		$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -Fo$@ ebrowse.c
 #
 # don't know what to do with these yet...
 #
@@ -128,7 +140,7 @@ $(BLD)\ctags.obj: ctags.c
 #
 # From ..\src\makefile.nt.
 #
-obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c mocklisp.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c w32faces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
+obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c mocklisp.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c w32faces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
 
 #
 # These are the lisp files that are loaded up in loadup.el
@@ -215,9 +227,6 @@ $(DOC):		$(BLD)\make-docfile.exe
 {$(BLD)}.obj{$(BLD)}.exe:
 		$(LINK) -out:$@ $(LINK_FLAGS) $*.obj $(LIBS)
 
-.c{$(BLD)}.obj:
-		$(CC) $(CFLAGS) -Fo$@ $<
-
 #
 # Build the executables
 #
@@ -241,8 +250,10 @@ install:	$(INSTALL_FILES)
 # Maintenance
 # 
 clean:;		- $(DEL) *~ *.pdb DOC*
+		- $(DEL) *.orig *.rej *.crlf ctags.c
 		- $(DEL_TREE) deleted
-		- $(DEL_TREE) $(OBJDIR)
+		- $(DEL_TREE) obj
+		- $(DEL_TREE) obj-spd
 
 #
 # Headers we would preprocess if we could.
@@ -257,13 +268,6 @@ clean:;		- $(DEL) *~ *.pdb DOC*
 EMACS_ROOT	= ..
 SRC		= .
 
-$(BLD)\alloca.obj : \
-	$(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.obj : \
 	$(SRC)\b2m.c \
 	$(EMACS_ROOT)\src\s\ms-w32.h \
@@ -360,7 +364,6 @@ $(BLD)\movemail.obj : \
 	$(EMACS_ROOT)\src\m\intel386.h \
 	$(EMACS_ROOT)\lib-src\..\src\config.h \
 	$(EMACS_ROOT)\nt\inc\sys\file.h \
-	$(EMACS_ROOT)\src\vmsproc.h \
 	$(EMACS_ROOT)\lib-src\..\src\syswait.h \
 	$(EMACS_ROOT)\nt\inc\pwd.h \
 	$(SRC)\ntlib.h
@@ -381,7 +384,6 @@ $(BLD)\profile.obj : \
 	$(EMACS_ROOT)\src\s\ms-w32.h \
 	$(EMACS_ROOT)\src\m\intel386.h \
 	$(EMACS_ROOT)\lib-src\..\src\config.h \
-	$(EMACS_ROOT)\src\vmstime.h \
 	$(EMACS_ROOT)\lib-src\..\src\systime.h
 
 $(BLD)\qsort.obj : \