Changeset 1665
- Timestamp:
- Jun 30, 2008, 11:14:11 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
Config.kmk (modified) (1 diff)
-
Makefile.kmk (modified) (3 diffs)
-
src/Makefile.kmk (modified) (2 diffs)
-
src/ash/Makefile.kmk (modified) (9 diffs)
-
src/fastdep/Makefile.kmk (modified) (3 diffs)
-
src/kDepPre/Makefile.kmk (modified) (3 diffs)
-
src/kObjCache/Makefile.kmk (modified) (2 diffs)
-
src/kash/Makefile.kmk (modified) (7 diffs)
-
src/kmk/Makefile.kmk (modified) (8 diffs)
-
src/kmk/w32/Makefile.kmk (modified) (3 diffs)
-
src/lib/Makefile.kmk (modified) (3 diffs)
-
src/sed/Makefile.kmk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/Config.kmk ¶
r1605 r1665 256 256 257 257 258 LIB_KDEP = $(PATH_OBJ)/ src/lib/kDep/$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kDep$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF)259 LIB_KUTIL = $(PATH_OBJ)/ src/lib/kUtil/$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kUtil$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF)260 261 258 LIB_KDEP = $(PATH_OBJ)/kDep/$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kDep$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF) 259 LIB_KUTIL = $(PATH_OBJ)/kUtil/$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kUtil$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF) 260 261 -
TabularUnified trunk/Makefile.kmk ¶
r1544 r1665 1 1 # $Id$ 2 2 ## @file 3 # Top-Level Makefile for kBuild.3 # Top-Level Sub-Makefile for kBuild. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = .28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = . 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 SUBDIRS = src 30 include $(PATH_SUB_CURRENT)/src/Makefile.kmk 31 31 32 32 … … 73 73 74 74 75 include $(FILE_KBUILD_ FOOTER)75 include $(FILE_KBUILD_SUB_FOOTER) 76 76 -
TabularUnified trunk/src/Makefile.kmk ¶
r1509 r1665 1 1 # $Id$ 2 2 ## @file 3 # Makefile for the source directory.3 # Sub-makefile for the source directory. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = ..28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = .. 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 SUBDIRS = lib kmk sed kDepPre kObjCache 30 include $(PATH_SUB_CURRENT)/lib/Makefile.kmk 31 include $(PATH_SUB_CURRENT)/kmk/Makefile.kmk 32 include $(PATH_SUB_CURRENT)/sed/Makefile.kmk 33 include $(PATH_SUB_CURRENT)/kDepPre/Makefile.kmk 34 include $(PATH_SUB_CURRENT)/kObjCache/Makefile.kmk 31 35 ifneq ($(KBUILD_TARGET),win) 32 SUBDIRS += ash 36 include $(PATH_SUB_CURRENT)/ash/Makefile.kmk 33 37 endif 34 38 35 include $(FILE_KBUILD_ FOOTER)39 include $(FILE_KBUILD_SUB_FOOTER) 36 40 -
TabularUnified trunk/src/ash/Makefile.kmk ¶
r1624 r1665 1 1 # $Id: Makefile.kmk 785 2007-01-24 22:21:56Z bird $ 2 2 ## @file 3 # ash3 # Sub-makefile for kmk_ash. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = ../..28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = ../.. 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 30 #INSTALLS = ash.man … … 46 46 kmk_ash_DEFS.freebsd = \ 47 47 HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME 48 kmk_ash_INCS = $(PATH_ TARGET) . # (the last is because of error.h)49 kmk_ash_CFLAGS.win = -I. ## @todo kBuild bug .48 kmk_ash_INCS = $(PATH_kmk_ash) . # (the last is because of error.h) 49 kmk_ash_CFLAGS.win = -I. ## @todo kBuild bug? 50 50 kmk_ash_INCS.win = win 51 51 kmk_ash_SOURCES = \ … … 75 75 bltin/kill.c \ 76 76 bltin/test.c \ 77 $(PATH_ TARGET)/arith.c \78 $(PATH_ TARGET)/builtins.c \79 $(PATH_ TARGET)/init.c \80 $(PATH_ TARGET)/nodes.c77 $(PATH_kmk_ash)/arith.c \ 78 $(PATH_kmk_ash)/builtins.c \ 79 $(PATH_kmk_ash)/init.c \ 80 $(PATH_kmk_ash)/nodes.c 81 81 kmk_ash_SOURCES.linux = \ 82 82 sys_signame.c \ … … 96 96 97 97 kmk_ash_INTERMEDIATES = \ 98 $(PATH_ TARGET)/arith.h \99 $(PATH_ TARGET)/builtins.h \100 $(PATH_ TARGET)/nodes.h \101 $(PATH_ TARGET)/token.h98 $(PATH_kmk_ash)/arith.h \ 99 $(PATH_kmk_ash)/builtins.h \ 100 $(PATH_kmk_ash)/nodes.h \ 101 $(PATH_kmk_ash)/token.h 102 102 kmk_ash_CLEAN = \ 103 103 $(kmk_ash_INTERMEDIATES) \ 104 $(PATH_ TARGET)/arith.c \105 $(PATH_ TARGET)/arith_lex.c \106 $(PATH_ TARGET)/builtins.c \107 $(PATH_ TARGET)/init.c \108 $(PATH_ TARGET)/nodes.c104 $(PATH_kmk_ash)/arith.c \ 105 $(PATH_kmk_ash)/arith_lex.c \ 106 $(PATH_kmk_ash)/builtins.c \ 107 $(PATH_kmk_ash)/init.c \ 108 $(PATH_kmk_ash)/nodes.c 109 109 110 110 kmk_ash.man_TEMPLATE = usr.bin.man … … 115 115 116 116 if1of ($(KBUILD_TARGET), win nt) 117 118 117 # 119 118 # Use the pregenerated code. 120 119 # 121 120 kmk_ash_DEPS := 122 kmk_ash_SOURCES += $(PATH_TARGET)/arith_lex.c 121 kmk_ash_SOURCES += $(PATH_kmk_ash)/arith_lex.c 122 123 include $(FILE_KBUILD_SUB_FOOTER) 123 124 124 125 define def_copy_generated 125 $(PATH_ TARGET)/$(src): generated/$(src)126 $(PATH_kmk_ash)/$(src): generated/$(src) 126 127 $$(RM) -f $$@ 127 128 $$(CP) -f $$^ $$@ 128 kmk_ash_DEPS += $(PATH_TARGET)/$(src)129 129 endef 130 130 … … 132 132 $(eval $(def_copy_generated))) 133 133 134 include $(FILE_KBUILD_FOOTER)135 134 136 135 else 136 # 137 # Generate the code on the fly. 138 # 137 139 138 140 ifeq (1,2) #disabled for now. … … 142 144 kmk_ash_LEXFLAGS = -8 143 145 else 144 kmk_ash_SOURCES += $(PATH_ TARGET)/arith_lex.c146 kmk_ash_SOURCES += $(PATH_kmk_ash)/arith_lex.c 145 147 endif 146 148 147 include $(FILE_KBUILD_ FOOTER)149 include $(FILE_KBUILD_SUB_FOOTER) 148 150 149 151 # … … 160 162 endif 161 163 162 $(PATH_ TARGET)/arith.h + $(PATH_TARGET)/arith.c: arith.y | $(call DIRDEP,$(PATH_TARGET))164 $(PATH_kmk_ash)/arith.h + $(PATH_kmk_ash)/arith.c: $(kmk_ash_PATH)/arith.y | $(call DIRDEP,$(PATH_kmk_ash)) 163 165 $(YACC) -ld $^ 164 $(MV) -f y.tab.c $(PATH_ TARGET)/arith.c165 $(MV) -f y.tab.h $(PATH_ TARGET)/arith.h166 $(MV) -f y.tab.c $(PATH_kmk_ash)/arith.c 167 $(MV) -f y.tab.h $(PATH_kmk_ash)/arith.h 166 168 167 169 ifndef kmk_ash_LEXTOOL 168 $(PATH_ TARGET)/arith_lex.c: arith_lex.l | $(call DIRDEP,$(PATH_TARGET))170 $(PATH_kmk_ash)/arith_lex.c: $(kmk_ash_PATH)/arith_lex.l | $(call DIRDEP,$(PATH_kmk_ash)) 169 171 flex -8 -o$@ $^ # 8-bit lex scanner for arithmetic 170 172 endif 171 173 172 $(PATH_TARGET)/builtins.h + $(PATH_TARGET)/builtins.c: $(PATH_CURRENT)/mkbuiltins shell.h builtins.def | $(call DIRDEP,$(PATH_TARGET)) 174 $(PATH_kmk_ash)/builtins.h + $(PATH_kmk_ash)/builtins.c: \ 175 $(kmk_ash_PATH)/mkbuiltins \ 176 $(kmk_ash_PATH)/shell.h \ 177 $(kmk_ash_PATH)/builtins.def \ 178 | $(call DIRDEP,$(PATH_kmk_ash)) 173 179 $(BOOTSTRAP_SHELL) $+ $(dir $@) 174 [ -f $(PATH_TARGET)/builtins.h ] 175 176 $(PATH_TARGET)/nodes.h + $(PATH_TARGET)/nodes.c: $(PATH_CURRENT)/mknodes.sh nodetypes nodes.c.pat | $(call DIRDEP,$(PATH_TARGET)) 180 [ -f $(PATH_kmk_ash)/builtins.h ] 181 182 $(PATH_kmk_ash)/nodes.h + $(PATH_kmk_ash)/nodes.c: \ 183 $(kmk_ash_PATH)/mknodes.sh \ 184 $(kmk_ash_PATH)/nodetypes \ 185 $(kmk_ash_PATH)/nodes.c.pat \ 186 | $(call DIRDEP,$(PATH_kmk_ash)) 177 187 $(BOOTSTRAP_SHELL) $+ $(dir $@) 178 188 [ -f $(dir $@)/nodes.h ] 179 189 180 $(PATH_ TARGET)/token.h: $(PATH_CURRENT)/mktokens | $(call DIRDEP,$(PATH_TARGET))190 $(PATH_kmk_ash)/token.h: $(kmk_ash_PATH)/mktokens | $(call DIRDEP,$(PATH_kmk_ash)) 181 191 $(BOOTSTRAP_SHELL) $+ 182 192 $(MV) token.h $@ 183 193 184 $(PATH_TARGET)/init.c: $(PATH_CURRENT)/mkinit.sh $(filter-out $(PATH_TARGET)/%,$(kmk_ash_SOURCES)) | $(call DIRDEP,$(PATH_TARGET)) 194 $(PATH_kmk_ash)/init.c: \ 195 $(kmk_ash_PATH)/mkinit.sh \ 196 $(abspathex $(filter-out $(PATH_kmk_ash)/%,$(kmk_ash_SOURCES)), $(kmk_ash_PATH)) \ 197 | $(call DIRDEP,$(PATH_kmk_ash)) 185 198 $(BOOTSTRAP_SHELL) $+ 186 199 $(MV) init.c $@ 187 200 188 endif 201 endif # generate on the fly -
TabularUnified trunk/src/fastdep/Makefile.kmk ¶
r1509 r1665 1 1 # $Id: Makefile.kmk 785 2007-01-24 22:21:56Z bird $ 2 2 ## @file 3 # Testing the VAC308 tool / ancient dependency generator.3 # Sub-makefile for testing the VAC308 tool / ancient dependency generator. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = ../..28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = ../.. 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 30 … … 55 55 56 56 57 include $(FILE_KBUILD_ FOOTER)57 include $(FILE_KBUILD_SUB_FOOTER) 58 58 -
TabularUnified trunk/src/kDepPre/Makefile.kmk ¶
r1509 r1665 1 1 # $Id$ 2 2 ## @file 3 # kDepPre - Precompiler basedependency generator.3 # Sub-makefile for kDepPre, the precompiler based dependency generator. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = ../..28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = ../.. 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 30 PROGRAMS += kDepPre … … 35 35 kDepPre_DEFS += NEED_ISBLANK=1 __WIN32__=1 36 36 endif 37 kDepPre_SOURCES = $(PATH_CURRENT)/kDepPre.c37 kDepPre_SOURCES = kDepPre.c 38 38 39 include $(FILE_KBUILD_FOOTER) 39 include $(FILE_KBUILD_SUB_FOOTER) 40 -
TabularUnified trunk/src/kObjCache/Makefile.kmk ¶
r1509 r1665 1 1 # $Id: Makefile.kmk 785 2007-01-24 22:21:56Z bird $ 2 2 ## @file 3 # kObjCache3 # Sub-makefile for kObjCache. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH ?= ../.. 28 #SUB_DEPTH = ../.. 27 SUB_DEPTH = ../.. 29 28 include $(PATH_KBUILD)/subheader.kmk 30 29 -
TabularUnified trunk/src/kash/Makefile.kmk ¶
r1604 r1665 1 1 # $Id$ 2 2 ## @file 3 # kBuild Makefile for kash.3 # Sub-makefile for kash. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = ../..28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = ../.. 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 30 # … … 49 49 kash_DEFS.freebsd = \ 50 50 HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME 51 kash_INCS = $(PATH_ TARGET) . # (the last is because of error.h)51 kash_INCS = $(PATH_kash) . # (the last is because of error.h) 52 52 kash_SOURCES = \ 53 53 main.c \ … … 77 77 bltin/test.c \ 78 78 \ 79 $(PATH_ TARGET)/arith.c \80 $(PATH_ TARGET)/arith_lex.c \81 $(PATH_ TARGET)/builtins.c \82 $(PATH_ TARGET)/init.c \83 $(PATH_ TARGET)/nodes.c \79 $(PATH_kash)/arith.c \ 80 $(PATH_kash)/arith_lex.c \ 81 $(PATH_kash)/builtins.c \ 82 $(PATH_kash)/init.c \ 83 $(PATH_kash)/nodes.c \ 84 84 \ 85 85 setmode.c \ … … 98 98 99 99 kash_ORDERDEPS = \ 100 $(PATH_ TARGET)/arith.h \101 $(PATH_ TARGET)/builtins.h \102 $(PATH_ TARGET)/nodes.h \103 $(PATH_ TARGET)/token.h100 $(PATH_kash)/arith.h \ 101 $(PATH_kash)/builtins.h \ 102 $(PATH_kash)/nodes.h \ 103 $(PATH_kash)/token.h 104 104 kash_CLEAN = \ 105 105 $(kash_ORDERDEPS) \ 106 $(PATH_ TARGET)/arith.c \107 $(PATH_ TARGET)/arith_lex.c \108 $(PATH_ TARGET)/builtins.c \109 $(PATH_ TARGET)/init.c \110 $(PATH_ TARGET)/nodes.c106 $(PATH_kash)/arith.c \ 107 $(PATH_kash)/arith_lex.c \ 108 $(PATH_kash)/builtins.c \ 109 $(PATH_kash)/init.c \ 110 $(PATH_kash)/nodes.c 111 111 112 112 ## … … 125 125 kash_ORDERDEPS := 126 126 kash_INCS += generated 127 kash_SOURCES := $(patsubst $(PATH_ TARGET)/%,generated/%,$(kash_SOURCES))127 kash_SOURCES := $(patsubst $(PATH_kash)/%,generated/%,$(kash_SOURCES)) 128 128 129 include $(FILE_KBUILD_ FOOTER)129 include $(FILE_KBUILD_SUB_FOOTER) 130 130 131 131 else 132 132 133 include $(FILE_KBUILD_ FOOTER)133 include $(FILE_KBUILD_SUB_FOOTER) 134 134 135 135 # … … 144 144 YACC ?= yacc 145 145 146 $(PATH_ TARGET)/arith.h $(PATH_TARGET)/arith.c: arith.y | $(call DIRDEP,$(PATH_TARGET))146 $(PATH_kash)/arith.h $(PATH_kash)/arith.c: arith.y | $(call DIRDEP,$(PATH_kash)) 147 147 $(YACC) -ld $^ 148 $(MV) -f y.tab.c $(PATH_ TARGET)/arith.c149 $(MV) -f y.tab.h $(PATH_ TARGET)/arith.h148 $(MV) -f y.tab.c $(PATH_kash)/arith.c 149 $(MV) -f y.tab.h $(PATH_kash)/arith.h 150 150 151 $(PATH_ TARGET)/arith_lex.c: arith_lex.l | $(call DIRDEP,$(PATH_TARGET))151 $(PATH_kash)/arith_lex.c: arith_lex.l | $(call DIRDEP,$(PATH_kash)) 152 152 flex -8 -o$@ $^ # 8-bit lex scanner for arithmetic 153 153 154 $(PATH_ TARGET)/builtins.h $(PATH_TARGET)/builtins.c: $(PATH_CURRENT)/mkbuiltins shell.h builtins.def | $(call DIRDEP,$(PATH_TARGET))154 $(PATH_kash)/builtins.h $(PATH_kash)/builtins.c: $(kash_PATH)/mkbuiltins shell.h builtins.def | $(call DIRDEP,$(PATH_kash)) 155 155 $(BOOTSTRAP_SHELL) $+ $(dir $@) 156 [ -f $(PATH_ TARGET)/builtins.h ]156 [ -f $(PATH_kash)/builtins.h ] 157 157 158 $(PATH_ TARGET)/nodes.h $(PATH_TARGET)/nodes.c: $(PATH_CURRENT)/mknodes.sh nodetypes nodes.c.pat | $(call DIRDEP,$(PATH_TARGET))158 $(PATH_kash)/nodes.h $(PATH_kash)/nodes.c: $(kash_PATH)/mknodes.sh nodetypes nodes.c.pat | $(call DIRDEP,$(PATH_kash)) 159 159 $(BOOTSTRAP_SHELL) $+ $(dir $@) 160 160 [ -f $(dir $@)/nodes.h ] 161 161 162 $(PATH_ TARGET)/token.h: $(PATH_CURRENT)/mktokens | $(call DIRDEP,$(PATH_TARGET))162 $(PATH_kash)/token.h: $(kash_PATH)/mktokens | $(call DIRDEP,$(PATH_kash)) 163 163 $(BOOTSTRAP_SHELL) $+ 164 164 $(MV) token.h $@ 165 165 166 $(PATH_ TARGET)/init.c: $(PATH_CURRENT)/mkinit.sh $(filter-out $(PATH_TARGET)/%,$(kash_SOURCES)) | $(call DIRDEP,$(PATH_TARGET))166 $(PATH_kash)/init.c: $(kash_PATH)/mkinit.sh $(filter-out $(PATH_kash)/%,$(kash_SOURCES)) | $(call DIRDEP,$(PATH_kash)) 167 167 $(BOOTSTRAP_SHELL) $+ 168 168 $(MV) init.c $@ -
TabularUnified trunk/src/kmk/Makefile.kmk ¶
r1604 r1665 1 1 # $Id$ 2 2 ## @file 3 # kmk / GNU Make3 # Sub-makefile for kmk / GNU Make. 4 4 # 5 5 … … 25 25 # 26 26 27 28 DEPTH = ../.. 29 include $(PATH_KBUILD)/header.kmk 27 SUB_DEPTH = ../.. 28 include $(KBUILD_PATH)/subheader.kmk 30 29 31 30 … … 39 38 $(TEMPLATE_BIN_DEFS) \ 40 39 KBUILD_SVN_REV=$(KBUILD_SVN_REV) 41 TEMPLATE_BIN-KMK_DEPS = $(PATH_ TARGET)/config.h40 TEMPLATE_BIN-KMK_DEPS = $(PATH_kmk)/config.h 42 41 TEMPLATE_BIN-KMK_CLEAN = $(TEMPLATE_BIN-KMK_DEPS) 43 42 TEMPLATE_BIN-KMK_DEPS.solaris = \ 44 $(PATH_ TARGET)/fts.h \45 $(PATH_ TARGET)/paths.h43 $(PATH_kmk)/fts.h \ 44 $(PATH_kmk)/paths.h 46 45 TEMPLATE_BIN-KMK_CLEAN.solaris = $(TEMPLATE_BIN-KMK_DEPS.solaris) 47 46 TEMPLATE_BIN-KMK_DEPS.win = \ 48 $(PATH_ TARGET)/fts.h \49 $(PATH_ TARGET)/sysexits.h \50 $(PATH_ TARGET)/unistd.h \51 $(PATH_ TARGET)/paths.h \52 $(PATH_ TARGET)/grp.h \53 $(PATH_ TARGET)/pwd.h \54 $(PATH_ TARGET)/inttypes.h47 $(PATH_kmk)/fts.h \ 48 $(PATH_kmk)/sysexits.h \ 49 $(PATH_kmk)/unistd.h \ 50 $(PATH_kmk)/paths.h \ 51 $(PATH_kmk)/grp.h \ 52 $(PATH_kmk)/pwd.h \ 53 $(PATH_kmk)/inttypes.h 55 54 TEMPLATE_BIN-KMK_CFLAGS.win.amd64 = $(TEMPLATE_BIN_CFLAGS.win.amd64) -wd4244 -wd4267 56 55 TEMPLATE_BIN-KMK_CLEAN.win = $(TEMPLATE_BIN-KMK_DEPS.win) 57 TEMPLATE_BIN-KMK_INCS = $(PATH_ TARGET) . $(TEMPLATE_BIN_INCS)56 TEMPLATE_BIN-KMK_INCS = $(PATH_kmk) . $(TEMPLATE_BIN_INCS) 58 57 TEMPLATE_BIN-KMK_INCS.darwin = glob 59 58 TEMPLATE_BIN-KMK_INCS.dragonfly = glob … … 63 62 ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only. 64 63 ifeq ($(KBUILD_TARGET),win) 65 TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) /FI$( PATH_CURRENT)/electric.h -DELECTRIC_HEAP=164 TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) /FI$(kmk_PATH)/electric.h -DELECTRIC_HEAP=1 66 65 else 67 TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) -include $( PATH_CURRENT)/electric.h -DELECTRIC_HEAP=166 TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) -include $(kmk_PATH)/electric.h -DELECTRIC_HEAP=1 68 67 endif 69 68 endif … … 377 376 378 377 379 include $(FILE_KBUILD_ FOOTER)378 include $(FILE_KBUILD_SUB_FOOTER) 380 379 381 380 … … 383 382 # Use checked in config.h instead of running ./Configure for it. 384 383 # 385 config.h.$(KBUILD_TARGET) :=config.h.$(KBUILD_TARGET)386 $(PATH_ TARGET)/config.h: $(config.h.$(KBUILD_TARGET))384 kmk_config.h.$(KBUILD_TARGET) := $(kmk_PATH)/config.h.$(KBUILD_TARGET) 385 $(PATH_kmk)/config.h: $(kmk_config.h.$(KBUILD_TARGET)) 387 386 $(MKDIR) -p $(dir $@) 388 387 $(CP) $^ $@ … … 391 390 # Some missing headers. 392 391 # 393 $(PATH_ TARGET)/fts.h: kmkbuiltin/ftsfake.h | $(call DIRDEP,$(PATH_TARGET))392 $(PATH_kmk)/fts.h: kmkbuiltin/ftsfake.h | $(call DIRDEP,$(PATH_kmk)) 394 393 $(CP) $^ $@ 395 394 396 $(PATH_ TARGET)/unistd.h: | $(call DIRDEP,$(PATH_TARGET))397 $(ECHO_EXT) > $@ 398 399 $(PATH_ TARGET)/sysexits.h: | $(call DIRDEP,$(PATH_TARGET))400 $(ECHO_EXT) > $@ 401 402 $(PATH_ TARGET)/inttypes.h: | $(call DIRDEP,$(PATH_TARGET))403 $(ECHO_EXT) > $@ 404 405 $(PATH_ TARGET)/paths.h: | $(call DIRDEP,$(PATH_TARGET))406 $(ECHO_EXT) > $@ 407 408 $(PATH_ TARGET)/pwd.h: | $(call DIRDEP,$(PATH_TARGET))409 $(ECHO_EXT) > $@ 410 411 $(PATH_ TARGET)/grp.h: | $(call DIRDEP,$(PATH_TARGET))395 $(PATH_kmk)/unistd.h: | $(call DIRDEP,$(PATH_kmk)) 396 $(ECHO_EXT) > $@ 397 398 $(PATH_kmk)/sysexits.h: | $(call DIRDEP,$(PATH_kmk)) 399 $(ECHO_EXT) > $@ 400 401 $(PATH_kmk)/inttypes.h: | $(call DIRDEP,$(PATH_kmk)) 402 $(ECHO_EXT) > $@ 403 404 $(PATH_kmk)/paths.h: | $(call DIRDEP,$(PATH_kmk)) 405 $(ECHO_EXT) > $@ 406 407 $(PATH_kmk)/pwd.h: | $(call DIRDEP,$(PATH_kmk)) 408 $(ECHO_EXT) > $@ 409 410 $(PATH_kmk)/grp.h: | $(call DIRDEP,$(PATH_kmk)) 412 411 $(ECHO_EXT) > $@ 413 412 … … 463 462 464 463 test_stack: 465 $(MAKE) -f testcase-stack.kmk464 $(MAKE) -f $(kmk_PATH)/testcase-stack.kmk 466 465 467 466 test_math: 468 $(MAKE) -f testcase-math.kmk467 $(MAKE) -f $(kmk_PATH)/testcase-math.kmk 469 468 470 469 test_if1of: 471 $(MAKE) -f testcase-if1of.kmk470 $(MAKE) -f $(kmk_PATH)/testcase-if1of.kmk 472 471 473 472 test_local: 474 $(MAKE) -f testcase-local.kmk473 $(MAKE) -f $(kmk_PATH)/testcase-local.kmk 475 474 476 475 test_30_continued_on_failure_worker: -
TabularUnified trunk/src/kmk/w32/Makefile.kmk ¶
r1509 r1665 1 1 # $Id: Makefile.kmk 785 2007-01-24 22:21:56Z bird $ 2 2 ## @file 3 # tstFileInfo / w323 # Sub-makefile for tstFileInfo / w32. 4 4 # 5 5 … … 25 25 # 26 26 27 28 DEPTH = ../../.. 29 include $(PATH_KBUILD)/header.kmk 27 SUB_DEPTH = ../../.. 28 include $(KBUILD_PATH)/subheader.kmk 30 29 31 30 # … … 36 35 tstFileInfo_SOURCES = tstFileInfo.c 37 36 38 include $(FILE_KBUILD_FOOTER) 37 include $(FILE_KBUILD_SUB_FOOTER) 38 -
TabularUnified trunk/src/lib/Makefile.kmk ¶
r1509 r1665 1 1 # $Id$ 2 2 ## @file 3 # Various libraries and stuff.3 # Sub-makefile for various libraries and stuff. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = ../..28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = ../.. 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 30 LIBRARIES += kDep … … 52 52 wrapper_NOINST = 1 53 53 54 include $(FILE_KBUILD_ FOOTER)54 include $(FILE_KBUILD_SUB_FOOTER) 55 55 -
TabularUnified trunk/src/sed/Makefile.kmk ¶
r1604 r1665 1 1 # $Id$ 2 2 ## @file 3 # sed3 # Sub-Makefile for kmk_sed. 4 4 # 5 5 … … 25 25 # 26 26 27 DEPTH = ../..28 include $( PATH_KBUILD)/header.kmk27 SUB_DEPTH = ../.. 28 include $(KBUILD_PATH)/subheader.kmk 29 29 30 30 # … … 35 35 kmk_sed_TEMPLATE = BIN 36 36 kmk_sed_DEPS = \ 37 $(PATH_ TARGET)/config.h \38 $(PATH_ TARGET)/regex.h37 $(PATH_kmk_sed)/config.h \ 38 $(PATH_kmk_sed)/regex.h 39 39 kmk_sed_CLEAN = $(kmk_sed_DEPS) 40 40 kmk_sed_INCS = \ 41 $(PATH_ TARGET) \41 $(PATH_kmk_sed) \ 42 42 . \ 43 43 lib \ … … 79 79 ../lib/startuphacks-win.c 80 80 81 include $(FILE_KBUILD_ FOOTER)81 include $(FILE_KBUILD_SUB_FOOTER) 82 82 83 83 # 84 84 # Use checked in config.h instead of running ./configure for it. 85 85 # 86 config.h.$(KBUILD_TARGET) :=config.h.$(KBUILD_TARGET)86 kmk_sed_config.h.$(KBUILD_TARGET) := $(kmk_sed_PATH)/config.h.$(KBUILD_TARGET) 87 87 88 $(PATH_ TARGET)/config.h: $(config.h.$(KBUILD_TARGET)) | $(call DIRDEP,$(PATH_TARGET))89 $(CP) $^ $@88 $(PATH_kmk_sed)/config.h: $(kmk_sed_config.h.$(KBUILD_TARGET)) | $(call DIRDEP,$(PATH_kmk_sed)) 89 $(CP) -f $^ $@ 90 90 91 91 # 92 92 # Use the regex lib shipped with sed and not anything installed on the system. 93 93 # 94 $(PATH_ TARGET)/regex.h: lib/regex_.h | $(call DIRDEP,$(PATH_TARGET))95 $(CP) $^ $@94 $(PATH_kmk_sed)/regex.h: $(kmk_sed_PATH)/lib/regex_.h | $(call DIRDEP,$(PATH_kmk_sed)) 95 $(CP) -f $^ $@ 96 96
Note:
See TracChangeset
for help on using the changeset viewer.
