aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Voelker1995-06-10 02:22:49 +0000
committerGeoff Voelker1995-06-10 02:22:49 +0000
commitac11713e1d4df0e423ea1234df8fb25d65f378c2 (patch)
treeb373eb00ebeeb12306fbccba212002a76592d242
parent9989a75ec071bf9730abcaa725ab3277ccf4ea18 (diff)
downloademacs-ac11713e1d4df0e423ea1234df8fb25d65f378c2.tar.gz
emacs-ac11713e1d4df0e423ea1234df8fb25d65f378c2.zip
(ALL,addpm,addpm.exe,addpm.obj): Defined.
(all): Depend upon $(BLD) and $(ALL). (install): Depend upon emacs.bat. Create program item for Emacs. (clean): Delete obj. (emacs.bat): Defined.
-rw-r--r--nt/makefile.nt23
1 files changed, 21 insertions, 2 deletions
diff --git a/nt/makefile.nt b/nt/makefile.nt
index 82d0b24df83..54bfc8f211e 100644
--- a/nt/makefile.nt
+++ b/nt/makefile.nt
@@ -21,6 +21,16 @@
21# 9-6-94 21# 9-6-94
22!include makefile.def 22!include makefile.def
23 23
24ALL = $(BLD)\addpm.exe
25
26addpm: $(BLD) $(BLD)\addpm.exe
27$(BLD)\addpm.exe: $(BLD)\addpm.obj
28$(BLD)\addpm.obj: addpm.c
29 $(CC) -nologo -out:$@ addpm.c \
30 -link -out:$(BLD)\addpm.exe \
31 -subsystem:windows -entry:WinMainCRTStartup \
32 $(SYS_LDFLAGS) $(BASE_LIBS) user32.lib
33
24# Since Windows 95 does not support multiple commands on one command line 34# Since Windows 95 does not support multiple commands on one command line
25# (e.g., in for loops), we cannot use for loops any more. 35# (e.g., in for loops), we cannot use for loops any more.
26# SUBDIRS = lib-src src lisp 36# SUBDIRS = lib-src src lisp
@@ -29,7 +39,8 @@
29# Build emacs 39# Build emacs
30# 40#
31BUILD_CMD = $(MAKE) -f makefile.nt all 41BUILD_CMD = $(MAKE) -f makefile.nt all
32all:; cd ..\lib-src 42all: $(BLD) $(ALL)
43 cd ..\lib-src
33 $(BUILD_CMD) 44 $(BUILD_CMD)
34 cd ..\src 45 cd ..\src
35 $(BUILD_CMD) 46 $(BUILD_CMD)
@@ -38,11 +49,17 @@ all:; cd ..\lib-src
38 cd ..\nt 49 cd ..\nt
39 50
40 51
52emacs.bat: emacs.bat.in
53 echo @echo off > emacs.bat
54 echo REM !!! Warning: This file automatically generated !!! >> emacs.bat
55 echo set emacs_dir=$(INSTALL_DIR)>> emacs.bat
56 type emacs.bat.in >> emacs.bat
57
41# 58#
42# Build and install emacs in INSTALL_DIR 59# Build and install emacs in INSTALL_DIR
43# 60#
44INSTALL_CMD = $(MAKE) -f makefile.nt install 61INSTALL_CMD = $(MAKE) -f makefile.nt install
45install: all 62install: all emacs.bat
46 - mkdir $(INSTALL_DIR) 63 - mkdir $(INSTALL_DIR)
47 cd ..\lib-src 64 cd ..\lib-src
48 $(INSTALL_CMD) 65 $(INSTALL_CMD)
@@ -52,6 +69,7 @@ install: all
52 $(INSTALL_CMD) 69 $(INSTALL_CMD)
53 cd ..\nt 70 cd ..\nt
54 - $(CP) emacs.bat $(INSTALL_DIR)\bin 71 - $(CP) emacs.bat $(INSTALL_DIR)\bin
72 - $(ADDPM) $(INSTALL_DIR)\bin\emacs.bat $(EMACS_ICON_PATH)
55 - del /q ..\same-dir.tst 73 - del /q ..\same-dir.tst
56 - del /q $(INSTALL_DIR)\same-dir.tst 74 - del /q $(INSTALL_DIR)\same-dir.tst
57 echo SameDirTest > ..\same-dir.tst 75 echo SameDirTest > ..\same-dir.tst
@@ -97,6 +115,7 @@ real_install:
97CLEAN_CMD = $(MAKE) -f makefile.nt clean 115CLEAN_CMD = $(MAKE) -f makefile.nt clean
98clean:; - del /q /s *~ 116clean:; - del /q /s *~
99 - $(DEL_TREE) deleted 117 - $(DEL_TREE) deleted
118 - $(DEL_TREE) obj
100 - $(DEL_TREE) ..\bin 119 - $(DEL_TREE) ..\bin
101 cd ..\lib-src 120 cd ..\lib-src
102 $(CLEAN_CMD) 121 $(CLEAN_CMD)