HCoop / bpt / emacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Clean out last vestiges of the old HAVE_CONFIG_H stuff.
[bpt/emacs.git] / lib-src / makefile.w32-in
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index f09ede0..f1f42bc 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000-2011 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,36 +17,28 @@
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
-ALL = make-docfile hexl ctags etags movemail ebrowse 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
 
-LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-                 -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \
-                 -I../nt/inc -I../src
+LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
+                 -DNO_ARCHIVES=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)/test-distrib.exe: $(BLD)/test-distrib.$(O)
                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
-
-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
-emacsclient:   stamp_BLD $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
-
-test-distrib:  stamp_BLD $(BLD)/test-distrib.exe
-       "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
+               "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
 
 MOVEMAILOBJS =  $(BLD)/movemail.$(O) \
                $(BLD)/pop.$(O) \
@@ -73,7 +65,7 @@ $(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)
 
 $(BLD)/emacsclient.$(O):       emacsclient.c
                $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
@@ -142,7 +134,8 @@ obj =   dosfns.o msdos.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 xml.o
 
 #
 # These are the lisp files that are loaded up in loadup.el
@@ -271,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.
@@ -304,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.
@@ -332,7 +320,6 @@ clean:
                - $(DEL) ctags.c
                - $(DEL_TREE) $(OBJDIR)
                - $(DEL) stamp_BLD
-               - $(DEL) echolisp.tmp
 
 distclean: cleanall
        - $(DEL) TAGS
@@ -367,7 +354,6 @@ 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
 
@@ -376,7 +362,6 @@ $(BLD)/ctags.$(O) : \
        $(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
@@ -385,14 +370,12 @@ $(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
 
 $(BLD)/etags.$(O) : \
@@ -400,43 +383,20 @@ $(BLD)/etags.$(O) : \
        $(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 \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(MSTOOLS_SYS)/types.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 \
@@ -460,29 +420,19 @@ $(BLD)/pop.$(O) : \
 $(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)/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)/make-docfile.$(O) $(BLD)/hexl.$(O): stamp_BLD
 
 $(BLD)/test-distrib.$(O) $(MOVEMAILOBJS): stamp_BLD
 
Unnamed repository; edit this file 'description' to name the repository.