Standardize indentation somewhat.

Add bootstrap support. Pass $(MFLAGS) when invoking make recursively. Add shell-specific variants of top-level targets that invoke make recursively in other directories, and add necessary computed dependencies.
author: Andrew Innes 2000-09-14 21:51:16 +0000
committer: Andrew Innes 2000-09-14 21:51:16 +0000
commit: 5aa31fa6afed590ca31eff925f18fd2cba0802f4 (patch)
tree: 58a09a602d72b6562d96738aa274c6a1bb694121
parent: 12563abbfa02071849c2ec6053527fe1f16cd0a5 (diff)
download: emacs-5aa31fa6afed590ca31eff925f18fd2cba0802f4.tar.gz
emacs-5aa31fa6afed590ca31eff925f18fd2cba0802f4.zip
1 files changed, 124 insertions, 46 deletions
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 6b4ffdc2a7b..ccf86719dcc 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -62,67 +62,145 @@ $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
 which-sh:
-                @echo Using $(THE_SHELL) as shell.
+        @echo Using $(THE_SHELL) as shell.
 #
 # Build emacs
 #
-all:            which-sh $(BLD) $(ALL) all-other-dirs
+all:    which-sh $(BLD) $(ALL) all-other-dirs-$(SHELLTYPE)
+all-other-dirs-CMD:
+        cd ..\lib-src
+        $(MAKE) $(MFLAGS) all
+        cd ..\src
+        $(MAKE) $(MFLAGS) all
+        cd ..\lisp
+        $(MAKE) $(MFLAGS) all
+        cd ..\leim
+        $(MAKE) $(MFLAGS) all
+        cd ..\nt
+all-other-dirs-SH:
+        $(MAKE) $(MFLAGS) -C ../lib-src all
+        $(MAKE) $(MFLAGS) -C ../src all
+        $(MAKE) $(MFLAGS) -C ../lisp all
+        $(MAKE) $(MFLAGS) -C ../leim all
+bootstrap:      $(BLD) $(ALL) bootstrap-$(SHELLTYPE)
+bootstrap-CMD:
+        cd ..\src
+        $(MAKE) $(MFLAGS) bootstrap
+        $(MAKE) $(MFLAGS) bootstrap-clean
+        cd ..\lisp
+        $(MAKE) $(MFLAGS) bootstrap
+        cd ..\nt
+bootstrap-SH:
+        $(MAKE) $(MFLAGS) -C ../src bootstrap
+        $(MAKE) $(MFLAGS) -C ../src bootstrap-clean
+        $(MAKE) $(MFLAGS) -C ../lisp bootstrap
+bootstrap-clean: bootstrap-clean-$(SHELLTYPE)
+bootstrap-clean-CMD:
+        cd ..\src
+        $(MAKE) $(MFLAGS) bootstrap-clean
+        cd ..\lisp
+        $(MAKE) $(MFLAGS) bootstrap-clean
+bootstrap-clean-SH:
+        $(MAKE) $(MFLAGS) -C ../src bootstrap-clean
+        $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean
 $(INSTALL_DIR):
-                - mkdir "$(INSTALL_DIR)"
+        - mkdir "$(INSTALL_DIR)"
 $(INSTALL_DIR)/bin:
-                - mkdir "$(INSTALL_DIR)/bin"
+        - mkdir "$(INSTALL_DIR)/bin"
 #
 # Build and install emacs in INSTALL_DIR
 #
-install:        all $(INSTALL_DIR)/bin install-other-dirs
+install: all $(INSTALL_DIR)/bin install-other-dirs-$(SHELLTYPE)
-                - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
+        - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
-                - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
+        - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
-                - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
+        - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
-                - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
+        - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
-                - $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin
+        - $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin
-                - "$(INSTALL_DIR)/bin/addpm" /q
+        - "$(INSTALL_DIR)/bin/addpm" /q
-                - $(DEL) ../same-dir.tst
+        - $(DEL) ../same-dir.tst
-                - $(DEL) $(INSTALL_DIR)/same-dir.tst
+        - $(DEL) $(INSTALL_DIR)/same-dir.tst
-                - mkdir "$(INSTALL_DIR)/etc/icons"
+        - mkdir "$(INSTALL_DIR)/etc/icons"
-                - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
+        - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
-                echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
+        echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
-                $(IFNOTSAMEDIR) $(MAKE) real_install $(ENDIF)
+        $(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) real_install $(ENDIF)
-                - $(DEL) ../same-dir.tst
+        - $(DEL) ../same-dir.tst
-                - $(DEL) $(INSTALL_DIR)/same-dir.tst
+        - $(DEL) $(INSTALL_DIR)/same-dir.tst
+install-other-dirs-CMD:
+        cd ..\lib-src
+        $(MAKE) $(MFLAGS) install
+        cd ..\src
+        $(MAKE) $(MFLAGS) install
+        cd ..\lisp
+        $(MAKE) $(MFLAGS) install
+        cd ..\leim
+        $(MAKE) $(MFLAGS) install
+        cd ..\nt
+install-other-dirs-SH:
+        $(MAKE) $(MFLAGS) -C ../lib-src install
+        $(MAKE) $(MFLAGS) -C ../src install
+        $(MAKE) $(MFLAGS) -C ../lisp install
+        $(MAKE) $(MFLAGS) -C ../leim install
 real_install:
-                - $(DEL) ../same-dir.tst
+        - $(DEL) ../same-dir.tst
-                - $(DEL) $(INSTALL_DIR)/same-dir.tst
+        - $(DEL) $(INSTALL_DIR)/same-dir.tst
-                echo SameDirTest > $(INSTALL_DIR)/same-dir.tst
+        echo SameDirTest > $(INSTALL_DIR)/same-dir.tst
-                - mkdir "$(INSTALL_DIR)/etc"
+        - mkdir "$(INSTALL_DIR)/etc"
-                - mkdir "$(INSTALL_DIR)/info"
+        - mkdir "$(INSTALL_DIR)/info"
-                - mkdir "$(INSTALL_DIR)/lock"
+        - mkdir "$(INSTALL_DIR)/lock"
-                - mkdir "$(INSTALL_DIR)/data"
+        - mkdir "$(INSTALL_DIR)/data"
-                - mkdir "$(INSTALL_DIR)/site-lisp"
+        - mkdir "$(INSTALL_DIR)/site-lisp"
-                - mkdir "$(INSTALL_DIR)/etc/icons"
+        - mkdir "$(INSTALL_DIR)/etc/icons"
-                - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
+        - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
-                $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR)/etc $(ENDIF)
+        $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR)/etc $(ENDIF)
-                $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR)/info $(ENDIF)
+        $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR)/info $(ENDIF)
-                - $(DEL) ../same-dir.tst
+        - $(DEL) ../same-dir.tst
-                - $(DEL) $(INSTALL_DIR)/same-dir.tst
+        - $(DEL) $(INSTALL_DIR)/same-dir.tst
 #
 # Maintenance
 # 
-clean:          clean-other-dirs
+clean:  clean-other-dirs-$(SHELLTYPE)
-                - $(DEL) *~ *.pdb
+        - $(DEL) *~ *.pdb
-                - $(DEL_TREE) $(OBJDIR)
+        - $(DEL_TREE) $(OBJDIR)
-                - $(DEL) ../etc/DOC ../etc/DOC-X
+        - $(DEL) ../etc/DOC ../etc/DOC-X
-cleanall:       clean
+clean-other-dirs-CMD:
-                - $(DEL_TREE) obj
+        cd ..\lib-src
-                - $(DEL_TREE) obj-spd
+        $(MAKE) $(MFLAGS) clean
-                - $(DEL_TREE) oo
+        cd ..\src
-                - $(DEL_TREE) oo-spd
+        $(MAKE) $(MFLAGS) clean
+        cd ..\lisp
-realclean:      cleanall
+        $(MAKE) $(MFLAGS) clean
-                - $(DEL_TREE) ../bin
+        cd ..\leim
+        $(MAKE) $(MFLAGS) clean
+        cd ..\nt
+clean-other-dirs-SH:
+        $(MAKE) $(MFLAGS) -C ../lib-src clean
+        $(MAKE) $(MFLAGS) -C ../src clean
+        $(MAKE) $(MFLAGS) -C ../lisp clean
+        $(MAKE) $(MFLAGS) -C ../leim clean
+cleanall: clean
+         - $(DEL_TREE) obj
+         - $(DEL_TREE) obj-spd
+         - $(DEL_TREE) oo
+         - $(DEL_TREE) oo-spd
+realclean: cleanall
+        - $(DEL_TREE) ../bin
author	Andrew Innes	2000-09-14 21:51:16 +0000
committer	Andrew Innes	2000-09-14 21:51:16 +0000
commit	5aa31fa6afed590ca31eff925f18fd2cba0802f4 (patch)
tree	58a09a602d72b6562d96738aa274c6a1bb694121
parent	12563abbfa02071849c2ec6053527fe1f16cd0a5 (diff)
download	emacs-5aa31fa6afed590ca31eff925f18fd2cba0802f4.tar.gz emacs-5aa31fa6afed590ca31eff925f18fd2cba0802f4.zip

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 6b4ffdc2a7b..ccf86719dcc 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in
@@ -62,67 +62,145 @@ $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
62	$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)	62	$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
63		63
64	which-sh:	64	which-sh:
65	@echo Using $(THE_SHELL) as shell.	65	@echo Using $(THE_SHELL) as shell.
66		66
67	#	67	#
68	# Build emacs	68	# Build emacs
69	#	69	#
70	all: which-sh $(BLD) $(ALL) all-other-dirs	70	all: which-sh $(BLD) $(ALL) all-other-dirs-$(SHELLTYPE)
		71
		72	all-other-dirs-CMD:
		73	cd ..\lib-src
		74	$(MAKE) $(MFLAGS) all
		75	cd ..\src
		76	$(MAKE) $(MFLAGS) all
		77	cd ..\lisp
		78	$(MAKE) $(MFLAGS) all
		79	cd ..\leim
		80	$(MAKE) $(MFLAGS) all
		81	cd ..\nt
		82
		83	all-other-dirs-SH:
		84	$(MAKE) $(MFLAGS) -C ../lib-src all
		85	$(MAKE) $(MFLAGS) -C ../src all
		86	$(MAKE) $(MFLAGS) -C ../lisp all
		87	$(MAKE) $(MFLAGS) -C ../leim all
		88
		89	bootstrap: $(BLD) $(ALL) bootstrap-$(SHELLTYPE)
		90
		91	bootstrap-CMD:
		92	cd ..\src
		93	$(MAKE) $(MFLAGS) bootstrap
		94	$(MAKE) $(MFLAGS) bootstrap-clean
		95	cd ..\lisp
		96	$(MAKE) $(MFLAGS) bootstrap
		97	cd ..\nt
		98
		99	bootstrap-SH:
		100	$(MAKE) $(MFLAGS) -C ../src bootstrap
		101	$(MAKE) $(MFLAGS) -C ../src bootstrap-clean
		102	$(MAKE) $(MFLAGS) -C ../lisp bootstrap
		103
		104	bootstrap-clean: bootstrap-clean-$(SHELLTYPE)
		105
		106	bootstrap-clean-CMD:
		107	cd ..\src
		108	$(MAKE) $(MFLAGS) bootstrap-clean
		109	cd ..\lisp
		110	$(MAKE) $(MFLAGS) bootstrap-clean
		111
		112	bootstrap-clean-SH:
		113	$(MAKE) $(MFLAGS) -C ../src bootstrap-clean
		114	$(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean
71		115
72	$(INSTALL_DIR):	116	$(INSTALL_DIR):
73	- mkdir "$(INSTALL_DIR)"	117	- mkdir "$(INSTALL_DIR)"
74		118
75	$(INSTALL_DIR)/bin:	119	$(INSTALL_DIR)/bin:
76	- mkdir "$(INSTALL_DIR)/bin"	120	- mkdir "$(INSTALL_DIR)/bin"
77		121
78	#	122	#
79	# Build and install emacs in INSTALL_DIR	123	# Build and install emacs in INSTALL_DIR
80	#	124	#
81	install: all $(INSTALL_DIR)/bin install-other-dirs	125	install: all $(INSTALL_DIR)/bin install-other-dirs-$(SHELLTYPE)
82	- $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin	126	- $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
83	- $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin	127	- $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
84	- $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin	128	- $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
85	- $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin	129	- $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
86	- $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin	130	- $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin
87	- "$(INSTALL_DIR)/bin/addpm" /q	131	- "$(INSTALL_DIR)/bin/addpm" /q
88	- $(DEL) ../same-dir.tst	132	- $(DEL) ../same-dir.tst
89	- $(DEL) $(INSTALL_DIR)/same-dir.tst	133	- $(DEL) $(INSTALL_DIR)/same-dir.tst
90	- mkdir "$(INSTALL_DIR)/etc/icons"	134	- mkdir "$(INSTALL_DIR)/etc/icons"
91	- $(CP_DIR) icons $(INSTALL_DIR)/etc/icons	135	- $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
92	echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"	136	echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
93	$(IFNOTSAMEDIR) $(MAKE) real_install $(ENDIF)	137	$(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) real_install $(ENDIF)
94	- $(DEL) ../same-dir.tst	138	- $(DEL) ../same-dir.tst
95	- $(DEL) $(INSTALL_DIR)/same-dir.tst	139	- $(DEL) $(INSTALL_DIR)/same-dir.tst
		140
		141	install-other-dirs-CMD:
		142	cd ..\lib-src
		143	$(MAKE) $(MFLAGS) install
		144	cd ..\src
		145	$(MAKE) $(MFLAGS) install
		146	cd ..\lisp
		147	$(MAKE) $(MFLAGS) install
		148	cd ..\leim
		149	$(MAKE) $(MFLAGS) install
		150	cd ..\nt
		151
		152	install-other-dirs-SH:
		153	$(MAKE) $(MFLAGS) -C ../lib-src install
		154	$(MAKE) $(MFLAGS) -C ../src install
		155	$(MAKE) $(MFLAGS) -C ../lisp install
		156	$(MAKE) $(MFLAGS) -C ../leim install
96		157
97	real_install:	158	real_install:
98	- $(DEL) ../same-dir.tst	159	- $(DEL) ../same-dir.tst
99	- $(DEL) $(INSTALL_DIR)/same-dir.tst	160	- $(DEL) $(INSTALL_DIR)/same-dir.tst
100	echo SameDirTest > $(INSTALL_DIR)/same-dir.tst	161	echo SameDirTest > $(INSTALL_DIR)/same-dir.tst
101	- mkdir "$(INSTALL_DIR)/etc"	162	- mkdir "$(INSTALL_DIR)/etc"
102	- mkdir "$(INSTALL_DIR)/info"	163	- mkdir "$(INSTALL_DIR)/info"
103	- mkdir "$(INSTALL_DIR)/lock"	164	- mkdir "$(INSTALL_DIR)/lock"
104	- mkdir "$(INSTALL_DIR)/data"	165	- mkdir "$(INSTALL_DIR)/data"
105	- mkdir "$(INSTALL_DIR)/site-lisp"	166	- mkdir "$(INSTALL_DIR)/site-lisp"
106	- mkdir "$(INSTALL_DIR)/etc/icons"	167	- mkdir "$(INSTALL_DIR)/etc/icons"
107	- $(CP_DIR) icons $(INSTALL_DIR)/etc/icons	168	- $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
108	$(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR)/etc $(ENDIF)	169	$(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR)/etc $(ENDIF)
109	$(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR)/info $(ENDIF)	170	$(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR)/info $(ENDIF)
110	- $(DEL) ../same-dir.tst	171	- $(DEL) ../same-dir.tst
111	- $(DEL) $(INSTALL_DIR)/same-dir.tst	172	- $(DEL) $(INSTALL_DIR)/same-dir.tst
112		173
113	#	174	#
114	# Maintenance	175	# Maintenance
115	#	176	#
116	clean: clean-other-dirs	177	clean: clean-other-dirs-$(SHELLTYPE)
117	- $(DEL) ~ .pdb	178	- $(DEL) ~ .pdb
118	- $(DEL_TREE) $(OBJDIR)	179	- $(DEL_TREE) $(OBJDIR)
119	- $(DEL) ../etc/DOC ../etc/DOC-X	180	- $(DEL) ../etc/DOC ../etc/DOC-X
120		181
121	cleanall: clean	182	clean-other-dirs-CMD:
122	- $(DEL_TREE) obj	183	cd ..\lib-src
123	- $(DEL_TREE) obj-spd	184	$(MAKE) $(MFLAGS) clean
124	- $(DEL_TREE) oo	185	cd ..\src
125	- $(DEL_TREE) oo-spd	186	$(MAKE) $(MFLAGS) clean
126		187	cd ..\lisp
127	realclean: cleanall	188	$(MAKE) $(MFLAGS) clean
128	- $(DEL_TREE) ../bin	189	cd ..\leim
		190	$(MAKE) $(MFLAGS) clean
		191	cd ..\nt
		192
		193	clean-other-dirs-SH:
		194	$(MAKE) $(MFLAGS) -C ../lib-src clean
		195	$(MAKE) $(MFLAGS) -C ../src clean
		196	$(MAKE) $(MFLAGS) -C ../lisp clean
		197	$(MAKE) $(MFLAGS) -C ../leim clean
		198
		199	cleanall: clean
		200	- $(DEL_TREE) obj
		201	- $(DEL_TREE) obj-spd
		202	- $(DEL_TREE) oo
		203	- $(DEL_TREE) oo-spd
		204
		205	realclean: cleanall
		206	- $(DEL_TREE) ../bin