Changeset 2202 in kBuild

Timestamp:

Jan 6, 2009 2:33:42 PM (16 years ago)

Author:

bird

Message:

Config.kmk/Makefile.kmk: Some cleanup/fixes.

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -132 +132 @@
 TEMPLATE_BIN_DEFS.profile       = NDEBUG
 TEMPLATE_BIN_DEFS.release       = NDEBUG
+if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
+ TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
+else
+ TEMPLATE_BIN_INST             = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+endif
 
 ifeq ($(KBUILD_TARGET),os2)
@@ -139 +144 @@
 TEMPLATE_BIN_CFLAGS.release     = -O3
 TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack=1024 -g
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
- else
-TEMPLATE_BIN_INST               = kBuild/bin/os2.x86/
- endif
 endif
 
@@ -164 +164 @@
  endif
  TEMPLATE_BIN_LDFLAGS.profile   = -pg
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
- else
-  TEMPLATE_BIN_INST             = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
- endif
 endif
 
@@ -209 +204 @@
   #     $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcprt.lib - avoid this to save space!
  endif
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
- else
-  TEMPLATE_BIN_INST             = kBuild/bin/win.$(KBUILD_TARGET_ARCH)/
- endif
 endif
 
@@ -254 +244 @@
   TEMPLATE_BIN_LDFLAGS         += -Wl,-i
  endif
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
- else
-  TEMPLATE_BIN_INST             = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
- endif
 endif
 

trunk/Makefile.kmk

@@ -38 +38 @@
 kBuild_SOURCES := \
         $(foreach src,\
-                        $(wildcard \
-                                kBuild/*.kmk \
-                                kBuild/tools/*.kmk \
-                                kBuild/sdks/*.kmk \
-                                kBuild/units/*.kmk \
-                                kBuild/doc/*.txt \
-                                kBuild/doc/*.html \
-                                kBuild/msgstyles/* \
-                                kBuild/templates/*),\
-                        $(src)=>$(subst kBuild/,,$(src)))
+                $(wildcard \
+                        kBuild/*.kmk \
+                        kBuild/tools/*.kmk \
+                        kBuild/sdks/*.kmk \
+                        kBuild/units/*.kmk \
+                        kBuild/doc/*.txt \
+                        kBuild/doc/*.html \
+                        kBuild/msgstyles/* \
+                        kBuild/templates/*),\
+                $(src)=>$(subst kBuild/,,$(src)))
 endif
 
@@ -58 +58 @@
 
 kBuild_bin_SOURCES.os2 = \
-        kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc062.dll=>libc062.dll
+        kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc06.dll=>libc06.dll \
+        kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc061.dll=>libc061.dll \
+        kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc062.dll=>libc062.dll \
+        kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc063.dll=>libc063.dll
 
 if1of ($(KBUILD_TARGET), nt win)