Changeset 2434 for trunk/src/kmk/Makefile.kmk

Timestamp:

Jan 9, 2011, 6:45:08 PM (15 years ago)

Author:

bird

Message:

kBuild: Deprecating PATH_<target> and <target>_PATH in favor of <target>_0_OUTDIR and <target>_DEFPATH.

File:

• trunk/src/kmk/Makefile.kmk (modified) (6 diffs)

trunk/src/kmk/Makefile.kmk

@@ -39 +39 @@
         KBUILD_TYPE=\"$(KBUILD_TYPE)\"
 TEMPLATE_BIN-KMK_DEPS = \
-        $(PATH_kmk)/config.h \
-        $(PATH_kmk)/fts.h
+        $(kmk_0_OUTDIR)/config.h \
+        $(kmk_0_OUTDIR)/fts.h
 TEMPLATE_BIN-KMK_CLEAN = $(TEMPLATE_BIN-KMK_DEPS)
 TEMPLATE_BIN-KMK_DEPS.solaris = \
-        $(PATH_kmk)/paths.h
+        $(kmk_0_OUTDIR)/paths.h
 TEMPLATE_BIN-KMK_CLEAN.solaris = $(TEMPLATE_BIN-KMK_DEPS.solaris)
 TEMPLATE_BIN-KMK_DEPS.win     = \
-        $(PATH_kmk)/sysexits.h \
-        $(PATH_kmk)/unistd.h \
-        $(PATH_kmk)/paths.h \
-        $(PATH_kmk)/grp.h \
-        $(PATH_kmk)/pwd.h \
-        $(PATH_kmk)/inttypes.h
+        $(kmk_0_OUTDIR)/sysexits.h \
+        $(kmk_0_OUTDIR)/unistd.h \
+        $(kmk_0_OUTDIR)/paths.h \
+        $(kmk_0_OUTDIR)/grp.h \
+        $(kmk_0_OUTDIR)/pwd.h \
+        $(kmk_0_OUTDIR)/inttypes.h
 TEMPLATE_BIN-KMK_CFLAGS.win.amd64 = $(TEMPLATE_BIN-THREADED_CFLAGS.win.amd64) -wd4244 -wd4267
 TEMPLATE_BIN-KMK_CLEAN.win = $(TEMPLATE_BIN-KMK_DEPS.win)
-TEMPLATE_BIN-KMK_INCS = $(PATH_kmk) . $(TEMPLATE_BIN-THREADED_INCS)
+TEMPLATE_BIN-KMK_INCS = $(kmk_0_OUTDIR) . $(TEMPLATE_BIN-THREADED_INCS)
 TEMPLATE_BIN-KMK_INCS.darwin = glob
 TEMPLATE_BIN-KMK_INCS.dragonfly = glob
@@ -63 +63 @@
 ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
+ TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
 else
- TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) -include $(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
+ TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) -include $(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
 endif
 endif
@@ -491 +491 @@
 # Use checked in config.h instead of running ./Configure for it.
 #
-kmk_config.h.$(KBUILD_TARGET) := $(kmk_PATH)/config.h.$(KBUILD_TARGET)
-$(PATH_kmk)/config.h: $(kmk_config.h.$(KBUILD_TARGET))
+kmk_config.h.$(KBUILD_TARGET) := $(kmk_DEFPATH)/config.h.$(KBUILD_TARGET)
+$(kmk_0_OUTDIR)/config.h: $(kmk_config.h.$(KBUILD_TARGET))
         $(MKDIR) -p $(dir $@)
         $(CP) $^ $@
@@ -499 +499 @@
 # Some missing headers.
 #
-$(PATH_kmk)/fts.h: $(kmk_PATH)/kmkbuiltin/ftsfake.h | $(call DIRDEP,$(PATH_kmk))
+$(kmk_0_OUTDIR)/fts.h: $(kmk_DEFPATH)/kmkbuiltin/ftsfake.h | $(call DIRDEP,$(kmk_0_OUTDIR))
         $(CP) $^ $@
 
-$(PATH_kmk)/unistd.h: | $(call DIRDEP,$(PATH_kmk))
+$(kmk_0_OUTDIR)/unistd.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
         $(ECHO_EXT) > $@
 
-$(PATH_kmk)/sysexits.h: | $(call DIRDEP,$(PATH_kmk))
+$(kmk_0_OUTDIR)/sysexits.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
         $(ECHO_EXT) > $@
 
-$(PATH_kmk)/inttypes.h: | $(call DIRDEP,$(PATH_kmk))
+$(kmk_0_OUTDIR)/inttypes.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
         $(ECHO_EXT) > $@
 
-$(PATH_kmk)/paths.h: | $(call DIRDEP,$(PATH_kmk))
+$(kmk_0_OUTDIR)/paths.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
         $(ECHO_EXT) > $@
 
-$(PATH_kmk)/pwd.h: | $(call DIRDEP,$(PATH_kmk))
+$(kmk_0_OUTDIR)/pwd.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
         $(ECHO_EXT) > $@
 
-$(PATH_kmk)/grp.h: | $(call DIRDEP,$(PATH_kmk))
+$(kmk_0_OUTDIR)/grp.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
         $(ECHO_EXT) > $@
 
@@ -571 +571 @@
 
 test_stack:
-        $(MAKE) -f $(kmk_PATH)/testcase-stack.kmk
+        $(MAKE) -f $(kmk_DEFPATH)/testcase-stack.kmk
 
 test_math:
-        $(MAKE) -f $(kmk_PATH)/testcase-math.kmk
+        $(MAKE) -f $(kmk_DEFPATH)/testcase-math.kmk
 
 test_if1of:
-        $(MAKE) -f $(kmk_PATH)/testcase-if1of.kmk
+        $(MAKE) -f $(kmk_DEFPATH)/testcase-if1of.kmk
 
 test_local:
-        $(MAKE) -f $(kmk_PATH)/testcase-local.kmk
+        $(MAKE) -f $(kmk_DEFPATH)/testcase-local.kmk
 
 test_includedep:
-        $(MAKE) -f $(kmk_PATH)/testcase-includedep.kmk
+        $(MAKE) -f $(kmk_DEFPATH)/testcase-includedep.kmk
 
 test_2ndtargetexp:
-        $(MAKE) -f $(kmk_PATH)/testcase-2ndtargetexp.kmk
+        $(MAKE) -f $(kmk_DEFPATH)/testcase-2ndtargetexp.kmk
 
 test_30_continued_on_failure_worker:
@@ -603 +603 @@
 
 test_lazy_deps_vars:
-        $(MAKE) -C $(kmk_PATH) -f testcase-lazy-deps-vars.kmk
+        $(MAKE) -C $(kmk_DEFPATH) -f testcase-lazy-deps-vars.kmk