X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/23373930daa192623bfda56960ccb04b2703fbe5..63807d4757d1c2ab6e4e0c5ec537316fcb324436:/lib-src/makefile.w32-in diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 0e203d18bd..854cda371e 100644 --- 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,33 +17,28 @@ # along with GNU Emacs. If not, see . -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)/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 -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) \ @@ -70,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 @@ -111,7 +106,7 @@ ctags.c: etags.c - $(DEL) ctags.c $(CP) etags.c ctags.c -CTAGS_CFLAGS = -DCTAGS $(ETAGS_CFLAGS) -DEMACS_NAME="\"GNU Emacs\"" +CTAGS_CFLAGS = -DCTAGS $(ETAGS_CFLAGS) $(BLD)/ctags.$(O): ctags.c $(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c @@ -140,7 +135,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 + gnutls.o xml.o # # These are the lisp files that are loaded up in loadup.el @@ -241,7 +236,6 @@ lisp2 = \ $(lispsource)language/georgian.el \ $(lispsource)language/khmer.el \ $(lispsource)language/burmese.el \ - $(lispsource)paths.el \ $(lispsource)register.elc \ $(lispsource)replace.elc \ $(lispsource)simple.elc \ @@ -269,11 +263,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. @@ -302,7 +291,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. @@ -330,7 +319,6 @@ clean: - $(DEL) ctags.c - $(DEL_TREE) $(OBJDIR) - $(DEL) stamp_BLD - - $(DEL) echolisp.tmp distclean: cleanall - $(DEL) TAGS @@ -365,7 +353,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 @@ -374,7 +361,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 @@ -383,14 +369,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) : \ @@ -398,35 +382,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)/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 \ @@ -450,25 +419,15 @@ $(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. #