diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2006-12-20 23:52:16 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2006-12-20 23:52:16 +0000 |
| commit | 32d0013e43d07383d6b8828856af02fb89102058 (patch) | |
| tree | 7f12b9610bb60d80f03879bdb656235ca03c6091 /nt/makefile.w32-in | |
| parent | 25e90411b6d5bc884cb5f1706b12593e532d9a90 (diff) | |
| download | emacs-32d0013e43d07383d6b8828856af02fb89102058.tar.gz | |
($(TRES)): Depend on $(BLD). Use $< instead of $(ALL_DEPS).
($(BLD)/addpm.$(O):
$(BLD)/ddeclient.$(O):
$(BLD)/runemacs.$(O):
$(BLD)/cmdproxy.$(O):
$(BLD)/addsection.$(O):
$(BLD)/preprep.$(O)): New dependency on $(BLD).
(all-other-dirs-nmake, all-other-dirs-gmake, bootstrap-nmake)
(bootstrap-gmake): Depend on addsection.
Diffstat (limited to 'nt/makefile.w32-in')
| -rw-r--r-- | nt/makefile.w32-in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 5e8de8bdf65..f751bb7872f 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -56,8 +56,8 @@ $(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
- $(RC) $(RC_OUT)$(BLD)/emacs.res $(ALL_DEPS)
+$(TRES): emacs.rc $(BLD)
+ $(RC) $(RC_OUT)$(BLD)/emacs.res $<
runemacs: $(BLD) $(BLD)/runemacs.exe
$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
@@ -67,12 +67,14 @@ $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) which-sh:
@echo Using $(THE_SHELL) as shell.
+$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): $(BLD)
+
#
# Build emacs
#
all: which-sh $(BLD) $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)
-all-other-dirs-nmake:
+all-other-dirs-nmake: addsection
cd ..\lib-src
$(MAKE) $(MFLAGS) all
cd ..\src
@@ -83,7 +85,7 @@ all-other-dirs-nmake: $(MAKE) $(MFLAGS) all
cd ..\nt
-all-other-dirs-gmake:
+all-other-dirs-gmake: addsection
$(MAKE) $(MFLAGS) -C ../lib-src all
$(MAKE) $(MFLAGS) -C ../src all
$(MAKE) $(MFLAGS) -C ../lisp all
@@ -129,7 +131,7 @@ maybe-bootstrap-SH: doit bootstrap: addsection bootstrap-$(MAKETYPE) all
-bootstrap-nmake:
+bootstrap-nmake: addsection
cd ..\lisp
$(MAKE) $(MFLAGS) bootstrap-clean
cd ..\src
@@ -145,7 +147,7 @@ bootstrap-nmake: $(MAKE) $(MFLAGS) DOC
cd ..\nt
-bootstrap-gmake:
+bootstrap-gmake: addsection
$(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean
$(MAKE) $(MFLAGS) -C ../src clean
$(MAKE) $(MFLAGS) -C ../lib-src clean
|