HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lisp/emacs-lisp/package.el (list-packages): Fix echo area message.
[bpt/emacs.git]
/
nt
/
makefile.w32-in
diff --git
a/nt/makefile.w32-in
b/nt/makefile.w32-in
index
73920e1
..
4e4e6ec
100644
(file)
--- a/
nt/makefile.w32-in
+++ b/
nt/makefile.w32-in
@@
-1,6
+1,5
@@
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
\r
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
\r
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
\r
-# 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
\r
+# Copyright (C) 2000-2011 Free Software Foundation, Inc.
\r
#
\r
# Top level makefile for building GNU Emacs on Windows NT
\r
#
\r
#
\r
# Top level makefile for building GNU Emacs on Windows NT
\r
#
\r
@@
-23,7
+22,7
@@
# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
\r
# (and remove or replace this comment).
\r
\r
# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
\r
# (and remove or replace this comment).
\r
\r
-VERSION = 24.0.
5
0
\r
+VERSION = 24.0.
9
0
\r
\r
TMP_DIST_DIR = emacs-$(VERSION)
\r
\r
\r
TMP_DIST_DIR = emacs-$(VERSION)
\r
\r
@@
-93,6
+92,8
@@
$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
all: which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)
\r
\r
all-other-dirs-nmake: addsection
\r
all: which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)
\r
\r
all-other-dirs-nmake: addsection
\r
+ cd ..\lib
\r
+ $(MAKE) $(MFLAGS) all
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) all
\r
cd ..\src
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) all
\r
cd ..\src
\r
@@
-104,6
+105,7
@@
all-other-dirs-nmake: addsection
cd ..\nt
\r
\r
all-other-dirs-gmake: addsection
\r
cd ..\nt
\r
\r
all-other-dirs-gmake: addsection
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all
\r
@@
-158,7
+160,9
@@
bootstrap-nmake: addsection cmdproxy
cd ..\src
\r
$(MAKE) $(MFLAGS) clean
\r
cd ..\lib-src
\r
cd ..\src
\r
$(MAKE) $(MFLAGS) clean
\r
cd ..\lib-src
\r
- $(MAKE) $(MFLAGS) clean
\r
+ $(MAKE) $(MFLAGS) clean make-docfile
\r
+ cd ..\lib
\r
+ $(MAKE) $(MFLAGS) clean all
\r
cd ..\src
\r
$(MAKE) $(MFLAGS) bootstrap
\r
$(MAKE) $(MFLAGS) bootstrap-clean
\r
cd ..\src
\r
$(MAKE) $(MFLAGS) bootstrap
\r
$(MAKE) $(MFLAGS) bootstrap-clean
\r
@@
-173,7
+177,8
@@
bootstrap-nmake: addsection cmdproxy
bootstrap-gmake: addsection cmdproxy
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
\r
bootstrap-gmake: addsection cmdproxy
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
\r
- $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean make-docfile
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean all
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
\r
$(CP) $(BLD)/cmdproxy.exe ../bin
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
\r
$(CP) $(BLD)/cmdproxy.exe ../bin
\r
@@
-185,11
+190,14
@@
bootstrap-clean: bootstrap-clean-$(MAKETYPE)
bootstrap-clean-nmake:
\r
cd ..\src
\r
$(MAKE) $(MFLAGS) bootstrap-clean
\r
bootstrap-clean-nmake:
\r
cd ..\src
\r
$(MAKE) $(MFLAGS) bootstrap-clean
\r
+ cd ..\lib
\r
+ $(MAKE) $(MFLAGS) clean
\r
cd ..\lisp
\r
$(MAKE) $(MFLAGS) bootstrap-clean
\r
\r
bootstrap-clean-gmake:
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
\r
cd ..\lisp
\r
$(MAKE) $(MFLAGS) bootstrap-clean
\r
\r
bootstrap-clean-gmake:
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
\r
\r
$(INSTALL_DIR):
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
\r
\r
$(INSTALL_DIR):
\r
@@
-298,6
+306,8
@@
clean: clean-other-dirs-$(MAKETYPE)
- $(DEL) ../etc/DOC ../etc/DOC-X
\r
\r
clean-other-dirs-nmake:
\r
- $(DEL) ../etc/DOC ../etc/DOC-X
\r
\r
clean-other-dirs-nmake:
\r
+ cd ..\lib
\r
+ $(MAKE) $(MFLAGS) clean
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) clean
\r
cd ..\src
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) clean
\r
cd ..\src
\r
@@
-315,6
+325,7
@@
clean-other-dirs-nmake:
cd ..\nt
\r
\r
clean-other-dirs-gmake:
\r
cd ..\nt
\r
\r
clean-other-dirs-gmake:
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean
\r
@@
-324,6
+335,8
@@
clean-other-dirs-gmake:
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean
\r
\r
cleanall-other-dirs-nmake:
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean
\r
\r
cleanall-other-dirs-nmake:
\r
+ cd ..\lib
\r
+ $(MAKE) $(MFLAGS) cleanall
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) cleanall
\r
cd ..\src
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) cleanall
\r
cd ..\src
\r
@@
-331,6
+344,7
@@
cleanall-other-dirs-nmake:
cd ..\nt
\r
\r
cleanall-other-dirs-gmake:
\r
cd ..\nt
\r
\r
cleanall-other-dirs-gmake:
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib cleanall
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall
\r
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall
\r
\r
@@
-356,6
+370,8
@@
top-distclean:
distclean: distclean-other-dirs-$(MAKETYPE) top-distclean
\r
\r
distclean-other-dirs-nmake:
\r
distclean: distclean-other-dirs-$(MAKETYPE) top-distclean
\r
\r
distclean-other-dirs-nmake:
\r
+ cd ..\lib
\r
+ $(MAKE) $(MFLAGS) distclean
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) distclean
\r
cd ..\src
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) distclean
\r
cd ..\src
\r
@@
-375,6
+391,7
@@
distclean-other-dirs-nmake:
cd ..\nt
\r
\r
distclean-other-dirs-gmake:
\r
cd ..\nt
\r
\r
distclean-other-dirs-gmake:
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib distclean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean
\r
@@
-387,6
+404,8
@@
distclean-other-dirs-gmake:
maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean
\r
\r
maintainer-clean-other-dirs-nmake:
\r
maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean
\r
\r
maintainer-clean-other-dirs-nmake:
\r
+ cd ..\lib
\r
+ $(MAKE) $(MFLAGS) maintainer-clean
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) maintainer-clean
\r
cd ..\src
\r
cd ..\lib-src
\r
$(MAKE) $(MFLAGS) maintainer-clean
\r
cd ..\src
\r
@@
-406,6
+425,7
@@
maintainer-clean-other-dirs-nmake:
cd ..\nt
\r
\r
maintainer-clean-other-dirs-gmake:
\r
cd ..\nt
\r
\r
maintainer-clean-other-dirs-gmake:
\r
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib maintainer-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean
\r
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean
\r
@@
-425,6
+445,7
@@
TAGS-gmake: frc
../lib-src/$(BLD)/etags $(CURDIR)/*.c
\r
$(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP
\r
$(MAKE) $(MFLAGS) -C ../lib-src TAGS
\r
../lib-src/$(BLD)/etags $(CURDIR)/*.c
\r
$(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP
\r
$(MAKE) $(MFLAGS) -C ../lib-src TAGS
\r
+ $(MAKE) $(MFLAGS) -C ../lib TAGS
\r
\r
TAGS-nmake:
\r
echo This target is not supported with NMake
\r
\r
TAGS-nmake:
\r
echo This target is not supported with NMake
\r