X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/e468b87f91f26e66a8cde087c1a9c89c67b96d12..e983096bb6a50fdae6625cb363642bcd74ec39c5:/nt/makefile.w32-in diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index e7a10698ea..053961a0c5 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # Top level makefile for building GNU Emacs on Windows NT # @@ -24,13 +24,15 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). +TRES = $(BLD)/emacs.res +CLIENTRES = $(BLD)/emacsclient.res + +XMFLAGS = + ALL = addpm ddeclient runemacs cmdproxy addsection preprep .PHONY: $(ALL) -TRES = $(BLD)/emacs.res - -XMFLAGS = addpm: stamp_BLD $(BLD)/addpm.exe $(BLD)/addpm.exe: $(BLD)/addpm.$(O) @@ -61,8 +63,11 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O) # The resource file. NT 3.10 requires the use of cvtres; even though # it is not necessary on later versions, it is still ok to use it. # -$(TRES): emacs.rc stamp_BLD - $(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc +$(TRES): emacs.rc icons/emacs.ico emacs.manifest stamp_BLD + $(RC) $(RC_OUT)$(TRES) emacs.rc + +$(CLIENTRES): emacsclient.rc stamp_BLD + $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc runemacs: stamp_BLD $(BLD)/runemacs.exe $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) @@ -81,7 +86,7 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O # # Build emacs # -all: which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE) +all: which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE) all-other-dirs-nmake: addsection cd ..\lib-src @@ -153,6 +158,7 @@ bootstrap-nmake: addsection cmdproxy cd ..\src $(MAKE) $(MFLAGS) bootstrap $(MAKE) $(MFLAGS) bootstrap-clean + cd ..\nt $(CP) $(BLD)/cmdproxy.exe ../bin cd ..\lisp $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap @@ -210,6 +216,8 @@ install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE) $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF) - $(CP_DIR) icons $(INSTALL_DIR)/etc $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF) + $(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF) + - $(CP) ../COPYING $(INSTALL_DIR)/bin - $(DEL) ../same-dir.tst - $(DEL) $(INSTALL_DIR)/same-dir.tst @@ -231,23 +239,27 @@ install-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install force-info: -# Note that man/makefile knows how to +# Note that doc/emacs/makefile knows how to # put the info files in $(infodir), # so we can do ok running make in the build dir. info: force-info info-$(MAKETYPE) info-nmake: - cd ..\man + cd ..\doc\emacs + $(MAKE) $(MFLAGS) info + cd ..\misc $(MAKE) $(MFLAGS) info cd ..\lispref $(MAKE) $(MFLAGS) info cd ..\lispintro $(MAKE) $(MFLAGS) info + cd $(MAKEDIR) info-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../man info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispref info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispintro info + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs info + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc info + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref info + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro info # # Maintenance # @@ -262,23 +274,26 @@ clean-other-dirs-nmake: $(MAKE) $(MFLAGS) clean cd ..\src $(MAKE) $(MFLAGS) clean - cd ..\lisp + cd ..\doc\lispintro $(MAKE) $(MFLAGS) clean - cd ..\lispintro - $(MAKE) $(MFLAGS) clean - cd ..\lispref + cd ..\doc\lispref $(MAKE) $(MFLAGS) clean cd ..\leim $(MAKE) $(MFLAGS) clean - cd ..\man + cd ..\doc\emacs + $(MAKE) $(MFLAGS) clean + cd ..\doc\misc $(MAKE) $(MFLAGS) clean cd ..\nt clean-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean cleanall-other-dirs-nmake: cd ..\lib-src @@ -299,5 +314,77 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE) - $(DEL_TREE) oo - $(DEL_TREE) oo-spd +top-distclean: + - $(DEL) $(COMPILER_TEMP_FILES) + - $(DEL_TREE) obj + - $(DEL_TREE) obj-spd + - $(DEL_TREE) oo + - $(DEL_TREE) oo-spd + - $(DEL) stamp_BLD + - $(DEL) ../etc/DOC ../etc/DOC-X + - $(DEL) config.log Makefile + +distclean: distclean-other-dirs-$(MAKETYPE) top-distclean + +distclean-other-dirs-nmake: + cd ..\lib-src + $(MAKE) $(MFLAGS) distclean + cd ..\src + $(MAKE) $(MFLAGS) distclean + cd ..\lisp + $(MAKE) $(MFLAGS) distclean + cd ..\leim + $(MAKE) $(MFLAGS) distclean + cd ..\doc\emacs + $(MAKE) $(MFLAGS) distclean + cd ..\doc\misc + $(MAKE) $(MFLAGS) distclean + cd ..\doc\lispintro + $(MAKE) $(MFLAGS) distclean + cd ..\doc\lispref + $(MAKE) $(MFLAGS) distclean + cd ..\nt + +distclean-other-dirs-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean + +maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean + +maintainer-clean-other-dirs-nmake: + cd ..\lib-src + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\src + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\lisp + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\leim + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\doc\emacs + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\doc\misc + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\doc\lispintro + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\doc\lispref + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\nt + +maintainer-clean-other-dirs-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean + realclean: cleanall - $(DEL_TREE) ../bin