Changeset 3629

Timestamp:

May 17, 2008, 12:41:33 PM (17 years ago)

Author:

bird

Message:

Fixes for missing template names (new kBuild is strict). Use EXTENDS_BY.

File:

• trunk/libc/Config.kmk (modified) (4 diffs)

trunk/libc/Config.kmk

@@ -74 +74 @@
 # Templates
 #
-## @todo I need recursive inheritance!
-TEMPLATE_libc =
-TEMPLATE_libc_EXTENDS = lib
+TEMPLATE_libc = libc template
 TEMPLATE_libc_TOOL = GCC3
 TEMPLATE_libc_INCS = $(PATH_LIBC_INC) $(dir $(LIBC-STD.H))
@@ -86 +84 @@
 TEMPLATE_libc_CFLAGS.release = $(TEMPLATE_lib_CFLAGS.release) -O3 -mcpu=pentium
 
-TEMPLATE_libc.logstrict =
+TEMPLATE_libc.logstrict = .
 TEMPLATE_libc.logstrict_EXTENDS = libc
-TEMPLATE_libc.logstrict_DEFS = $(TEMPLATE_libc_DEFS) __LIBC_STRICT DEBUG_LOGGING
-
-TEMPLATE_libc.profiled =
+TEMPLATE_libc.logstrict_EXTENDS_BY = appending
+TEMPLATE_libc.logstrict_DEFS = __LIBC_STRICT DEBUG_LOGGING
+
+TEMPLATE_libc.profiled = .
 TEMPLATE_libc.profiled_EXTENDS = libc
-TEMPLATE_libc.profiled_DEFS = $(TEMPLATE_libc_DEFS) __LIBC_PROFILED
+TEMPLATE_libc.profiled_EXTENDS_BY = appending
+TEMPLATE_libc.profiled_DEFS = __LIBC_PROFILED
 
 TEMPLATE_libcsub = LIBC Sub-Library.
@@ -109 +109 @@
 # Intel assembly libs (default templates uses AT&T assembly).
 
-TEMPLATE_libcasm =
+TEMPLATE_libcasm = .
 TEMPLATE_libcasm_TOOL = GCC3
 TEMPLATE_libcasm_TOOL.os2 = GCC3OMF
@@ -117 +117 @@
 TEMPLATE_libcasm_ASTOOL = ALP
 TEMPLATE_libcasm_ASFLAGS = -Sv:ALP
-else # NASM sucks too, but differently.
+else # NASM sucks too, but in different ways...
 TEMPLATE_libcasm_ASTOOL = NASM
 TEMPLATE_libcasm_ASFLAGS = -f obj -w+orphan-labels
 endif
 
-TEMPLATE_libcasm.logstrict =
+TEMPLATE_libcasm.logstrict = .
 TEMPLATE_libcasm.logstrict_EXTENDS = libcasm
-TEMPLATE_libcasm.logstrict_DEFS = $(TEMPLATE_libcasm_DEFS) __LIBC_STRICT DEBUG_LOGGING
-
-TEMPLATE_libcasm.profiled =
+TEMPLATE_libcasm.logstrict_EXTENDS_BY = appending
+TEMPLATE_libcasm.logstrict_DEFS = __LIBC_STRICT DEBUG_LOGGING
+
+TEMPLATE_libcasm.profiled =     .
 TEMPLATE_libcasm.profiled_EXTENDS = libcasm
-TEMPLATE_libcasm.profiled_DEFS = $(TEMPLATE_libcasm_DEFS) __LIBC_PROFILED
-
-TEMPLATE_libcsubasm =
+TEMPLATE_libcasm.profiled_EXTENDS_BY = appending
+TEMPLATE_libcasm.profiled_DEFS = __LIBC_PROFILED
+
+TEMPLATE_libcsubasm = .
 TEMPLATE_libcsubasm_EXTENDS = libcasm
 TEMPLATE_libcsubasm_NOINST = 1
 
-TEMPLATE_libcsubasm.logstrict =
+TEMPLATE_libcsubasm.logstrict = .
 TEMPLATE_libcsubasm.logstrict_EXTENDS = libcasm.logstrict
 TEMPLATE_libcsubasm.logstrict_NOINST = 1
 
-TEMPLATE_libcsubasm =
+TEMPLATE_libcsubasm.profiled = .
 TEMPLATE_libcsubasm.profiled_EXTENDS = libcasm.profiled
 TEMPLATE_libcsubasm.profiled_NOINST = 1