Changeset 1665 for trunk/src/kmk

Timestamp:

Jun 30, 2008, 11:14:11 PM (17 years ago)

Author:

bird

Message:

Converted to a sub-makefile setup ('single' makefile).

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (8 diffs)
• w32/Makefile.kmk (modified) (3 diffs)

trunk/src/kmk/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kmk / GNU Make
+# Sub-makefile for kmk / GNU Make.
 #
 
@@ -25 +25 @@
 #
 
-
-DEPTH = ../..
-include $(PATH_KBUILD)/header.kmk
+SUB_DEPTH = ../..
+include $(KBUILD_PATH)/subheader.kmk
 
 
@@ -39 +38 @@
         $(TEMPLATE_BIN_DEFS) \
         KBUILD_SVN_REV=$(KBUILD_SVN_REV)
-TEMPLATE_BIN-KMK_DEPS = $(PATH_TARGET)/config.h
+TEMPLATE_BIN-KMK_DEPS = $(PATH_kmk)/config.h
 TEMPLATE_BIN-KMK_CLEAN = $(TEMPLATE_BIN-KMK_DEPS)
 TEMPLATE_BIN-KMK_DEPS.solaris = \
-        $(PATH_TARGET)/fts.h \
-        $(PATH_TARGET)/paths.h
+        $(PATH_kmk)/fts.h \
+        $(PATH_kmk)/paths.h
 TEMPLATE_BIN-KMK_CLEAN.solaris = $(TEMPLATE_BIN-KMK_DEPS.solaris)
 TEMPLATE_BIN-KMK_DEPS.win     = \
-        $(PATH_TARGET)/fts.h \
-        $(PATH_TARGET)/sysexits.h \
-        $(PATH_TARGET)/unistd.h \
-        $(PATH_TARGET)/paths.h \
-        $(PATH_TARGET)/grp.h \
-        $(PATH_TARGET)/pwd.h \
-        $(PATH_TARGET)/inttypes.h
+        $(PATH_kmk)/fts.h \
+        $(PATH_kmk)/sysexits.h \
+        $(PATH_kmk)/unistd.h \
+        $(PATH_kmk)/paths.h \
+        $(PATH_kmk)/grp.h \
+        $(PATH_kmk)/pwd.h \
+        $(PATH_kmk)/inttypes.h
 TEMPLATE_BIN-KMK_CFLAGS.win.amd64 = $(TEMPLATE_BIN_CFLAGS.win.amd64) -wd4244 -wd4267
 TEMPLATE_BIN-KMK_CLEAN.win = $(TEMPLATE_BIN-KMK_DEPS.win)
-TEMPLATE_BIN-KMK_INCS = $(PATH_TARGET) . $(TEMPLATE_BIN_INCS)
+TEMPLATE_BIN-KMK_INCS = $(PATH_kmk) . $(TEMPLATE_BIN_INCS)
 TEMPLATE_BIN-KMK_INCS.darwin = glob
 TEMPLATE_BIN-KMK_INCS.dragonfly = glob
@@ -63 +62 @@
 ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) /FI$(PATH_CURRENT)/electric.h -DELECTRIC_HEAP=1
+ TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) /FI$(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
 else
- TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) -include $(PATH_CURRENT)/electric.h -DELECTRIC_HEAP=1
+ TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) -include $(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
 endif
 endif
@@ -377 +376 @@
 
 
-include $(FILE_KBUILD_FOOTER)
+include $(FILE_KBUILD_SUB_FOOTER)
 
 
@@ -383 +382 @@
 # Use checked in config.h instead of running ./Configure for it.
 #
-config.h.$(KBUILD_TARGET) := config.h.$(KBUILD_TARGET)
-$(PATH_TARGET)/config.h: $(config.h.$(KBUILD_TARGET))
+kmk_config.h.$(KBUILD_TARGET) := $(kmk_PATH)/config.h.$(KBUILD_TARGET)
+$(PATH_kmk)/config.h: $(kmk_config.h.$(KBUILD_TARGET))
         $(MKDIR) -p $(dir $@)
         $(CP) $^ $@
@@ -391 +390 @@
 # Some missing headers.
 #
-$(PATH_TARGET)/fts.h: kmkbuiltin/ftsfake.h | $(call DIRDEP,$(PATH_TARGET))
+$(PATH_kmk)/fts.h: kmkbuiltin/ftsfake.h | $(call DIRDEP,$(PATH_kmk))
         $(CP) $^ $@
 
-$(PATH_TARGET)/unistd.h: | $(call DIRDEP,$(PATH_TARGET))
-        $(ECHO_EXT) > $@
-
-$(PATH_TARGET)/sysexits.h: | $(call DIRDEP,$(PATH_TARGET))
-        $(ECHO_EXT) > $@
-
-$(PATH_TARGET)/inttypes.h: | $(call DIRDEP,$(PATH_TARGET))
-        $(ECHO_EXT) > $@
-
-$(PATH_TARGET)/paths.h: | $(call DIRDEP,$(PATH_TARGET))
-        $(ECHO_EXT) > $@
-
-$(PATH_TARGET)/pwd.h: | $(call DIRDEP,$(PATH_TARGET))
-        $(ECHO_EXT) > $@
-
-$(PATH_TARGET)/grp.h: | $(call DIRDEP,$(PATH_TARGET))
+$(PATH_kmk)/unistd.h: | $(call DIRDEP,$(PATH_kmk))
+        $(ECHO_EXT) > $@
+
+$(PATH_kmk)/sysexits.h: | $(call DIRDEP,$(PATH_kmk))
+        $(ECHO_EXT) > $@
+
+$(PATH_kmk)/inttypes.h: | $(call DIRDEP,$(PATH_kmk))
+        $(ECHO_EXT) > $@
+
+$(PATH_kmk)/paths.h: | $(call DIRDEP,$(PATH_kmk))
+        $(ECHO_EXT) > $@
+
+$(PATH_kmk)/pwd.h: | $(call DIRDEP,$(PATH_kmk))
+        $(ECHO_EXT) > $@
+
+$(PATH_kmk)/grp.h: | $(call DIRDEP,$(PATH_kmk))
         $(ECHO_EXT) > $@
 
@@ -463 +462 @@
 
 test_stack:
-        $(MAKE) -f testcase-stack.kmk
+        $(MAKE) -f $(kmk_PATH)/testcase-stack.kmk
 
 test_math:
-        $(MAKE) -f testcase-math.kmk
+        $(MAKE) -f $(kmk_PATH)/testcase-math.kmk
 
 test_if1of:
-        $(MAKE) -f testcase-if1of.kmk
+        $(MAKE) -f $(kmk_PATH)/testcase-if1of.kmk
 
 test_local:
-        $(MAKE) -f testcase-local.kmk
+        $(MAKE) -f $(kmk_PATH)/testcase-local.kmk
 
 test_30_continued_on_failure_worker:

trunk/src/kmk/w32/Makefile.kmk

@@ -1 +1 @@
 # $Id: Makefile.kmk 785 2007-01-24 22:21:56Z bird $
 ## @file
-# tstFileInfo / w32
+# Sub-makefile for tstFileInfo / w32.
 #
 
@@ -25 +25 @@
 #
 
-
-DEPTH = ../../..
-include $(PATH_KBUILD)/header.kmk
+SUB_DEPTH = ../../..
+include $(KBUILD_PATH)/subheader.kmk
 
 #
@@ -36 +35 @@
 tstFileInfo_SOURCES = tstFileInfo.c
 
-include $(FILE_KBUILD_FOOTER)
+include $(FILE_KBUILD_SUB_FOOTER)
+