X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b95b72547b5a2c5e4e294e9e703d3a85928f58f4..62aba0d4973c5cba7ac7c387bbe133e0e3061c5c:/lib-src/makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 854cda371e..23ef71de10 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,4 +1,4 @@
-#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+#  -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
 # Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -19,12 +19,11 @@
 
 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
+ $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe $(BLD)/profile.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)
@@ -38,7 +37,7 @@ $(BLD)/hexl.exe:		$(BLD)/hexl.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(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"
+		"$(BLD)/test-distrib.exe" "$(LIB_SRC)/testfile"
 
 MOVEMAILOBJS =  $(BLD)/movemail.$(O) \
 		$(BLD)/pop.$(O) \
@@ -110,6 +109,12 @@ CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS)
 $(BLD)/ctags.$(O): ctags.c
 		$(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c
 
+PROFILEOBJS	= $(BLD)/profile.$(O) \
+		  ../lib/$(BLD)/libgnu.$(A) \
+		  $(BLD)/ntlib.$(O)
+$(BLD)/profile.exe:	$(PROFILEOBJS)
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(PROFILEOBJS) $(LIBS)
+
 #
 # From ..\src\Makefile.in
 # It doesn't matter if the real name is *.obj for the files in this list,
@@ -135,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
@@ -306,6 +311,7 @@ install:	$(INSTALL_FILES)
 		$(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/emacsclient.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/emacsclientw.exe $(INSTALL_DIR)/bin
+		$(CP) $(BLD)/profile.exe $(INSTALL_DIR)/bin
 		- mkdir "$(INSTALL_DIR)/etc"
 		$(CP) $(DOC) $(INSTALL_DIR)/etc
 
@@ -348,85 +354,111 @@ TAGS: $(BLD)/etags.exe *.c *.h
 ### DEPENDENCIES ###
 
 EMACS_ROOT	= ..
-SRC		= .
-
-$(BLD)/alloca.$(O) : \
-	$(SRC)/alloca.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/config.h \
-	$(EMACS_ROOT)/src/blockinput.h
+LIB_SRC		= .
+SRC		= $(EMACS_ROOT)/src
+NT_INC		= $(EMACS_ROOT)/nt/inc
+GNU_LIB		= $(EMACS_ROOT)/lib
+
+MS_W32_H       = $(NT_INC)/ms-w32.h \
+		 $(NT_INC)/sys/stat.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 \
+		 $(NT_INC)/pwd.h
+SYSTIME_H      = $(SRC)/systime.h \
+		 $(NT_INC)/sys/time.h \
+		 $(GNU_LIB)/timespec.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)/lib-src/../src/config.h \
-	$(SRC)/ntlib.h \
-	$(EMACS_ROOT)/lib/getopt.h
+	$(LIB_SRC)/ctags.c \
+	$(SRC)/regex.h \
+	$(NT_INC)/sys/stat.h \
+	$(NT_INC)/unistd.h \
+	$(GNU_LIB)/c-strcase.h \
+	$(GNU_LIB)/getopt.h \
+	$(CONFIG_H)
 
 $(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
+	$(LIB_SRC)/ebrowse.c \
+	$(GNU_LIB)/getopt.h \
+	$(GNU_LIB)/min-max.h \
+	$(CONFIG_H)
 
 $(BLD)/emacsclient.$(O) : \
-	$(SRC)/emacsclient.c \
-	$(EMACS_ROOT)/nt/inc/sys/stat.h \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/lib-src/../src/config.h
+	$(LIB_SRC)/emacsclient.c \
+	$(NT_INC)/pwd.h \
+	$(NT_INC)/sys/stat.h \
+	$(NT_INC)/unistd.h \
+	$(GNU_LIB)/getopt.h \
+	$(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)/lib-src/../src/config.h \
-	$(SRC)/ntlib.h \
-	$(EMACS_ROOT)/lib/getopt.h
+	$(LIB_SRC)/etags.c \
+	$(SRC)/regex.h \
+	$(NT_INC)/sys/stat.h \
+	$(NT_INC)/unistd.h \
+	$(GNU_LIB)/c-strcase.h \
+	$(GNU_LIB)/getopt.h \
+	$(CONFIG_H)
 
 $(BLD)/hexl.$(O) : \
-	$(SRC)/hexl.c
+	$(LIB_SRC)/hexl.c \
+	$(CONFIG_H)
 
 $(BLD)/make-docfile.$(O) : \
-	$(SRC)/make-docfile.c \
-	$(EMACS_ROOT)/src/config.h
+	$(LIB_SRC)/make-docfile.c \
+	$(NT_INC)/unistd.h \
+	$(CONFIG_H)
 
 $(BLD)/movemail.$(O) : \
-	$(SRC)/movemail.c \
-	$(EMACS_ROOT)/src/s/ms-w32.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
-	$(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c
+	$(LIB_SRC)/movemail.c \
+	$(LIB_SRC)/pop.h \
+	$(SRC)/syswait.h \
+	$(NT_INC)/pwd.h \
+	$(NT_INC)/sys/file.h \
+	$(NT_INC)/sys/stat.h \
+	$(NT_INC)/unistd.h \
+	$(GNU_LIB)/getopt.h \
+	$(CONFIG_H) \
+	$(NTLIB_H)
 
 $(BLD)/ntlib.$(O) : \
-	$(SRC)/ntlib.c \
-	$(SRC)/ntlib.h \
-	$(EMACS_ROOT)/nt/inc/sys/stat.h \
-	$(EMACS_ROOT)/nt/inc/pwd.h
+	$(LIB_SRC)/ntlib.c \
+	$(NT_INC)/sys/stat.h \
+	$(NTLIB_H)
 
 $(BLD)/pop.$(O) : \
-	$(SRC)/pop.c \
-	$(SRC)/pop.h \
-	$(EMACS_ROOT)/lib/min-max.h \
-	$(SRC)/ntlib.h
+	$(LIB_SRC)/pop.c \
+	$(LIB_SRC)/pop.h \
+	$(NT_INC)/netdb.h \
+	$(NT_INC)/pwd.h \
+	$(NT_INC)/unistd.h \
+	$(GNU_LIB)/min-max.h \
+	$(CONFIG_H) \
+	$(NTLIB_H)
 
 $(BLD)/profile.$(O) : \
-	$(SRC)/profile.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/lib-src/../src/config.h \
-	$(EMACS_ROOT)/lib-src/../src/systime.h
-
-$(BLD)/tcp.$(O) : \
-	$(SRC)/tcp.c
+	$(LIB_SRC)/profile.c \
+	$(GNU_LIB)/intprops.h \
+	$(CONFIG_H) \
+	$(INTTYPES_H) \
+	$(SYSTIME_H)
+
+$(BLD)/regex.$(O) : \
+	$(SRC)/regex.c \
+	$(SRC)/regex.h \
+	$(NT_INC)/stdbool.h \
+	$(NT_INC)/unistd.h \
+	$(CONFIG_H)
 
 $(BLD)/test-distrib.$(O) : \
-	$(SRC)/test-distrib.c
+	$(LIB_SRC)/test-distrib.c \
+	$(NT_INC)/unistd.h \
+	$(CONFIG_H)
 
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
@@ -437,4 +469,4 @@ $(BLD)/test-distrib.$(O) $(MOVEMAILOBJS): stamp_BLD
 
 $(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O): stamp_BLD
 
-$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O): stamp_BLD
+$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O) $(BLD)/profile.$(O): stamp_BLD