Changeset 1388 in kBuild

Timestamp:

Jan 31, 2008 3:24:33 PM (17 years ago)

Author:

bird

Message:

Fixed SUFF_SYS for solaris. Made some space adjustments (if1of always takes a space after the comma).

File:

• trunk/kBuild/header.kmk (modified) (8 diffs)

trunk/kBuild/header.kmk

@@ -151 +151 @@
  BUILD_TYPE := release
 else
- if1of ($(BUILD_TYPE),$(KBUILD_OSES) $(KBUILD_ARCHES))
+ if1of ($(BUILD_TYPE), $(KBUILD_OSES) $(KBUILD_ARCHES))
   $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' is an OS or architecture!)
  endif
@@ -335 +335 @@
 
 # Win, Win32, Win64, NT.
-if1of ($(BUILD_PLATFORM),win nt)
+if1of ($(BUILD_PLATFORM), win nt)
 EXEC_X86_WIN32      :=
 HOSTSUFF_EXE        := .exe
@@ -363 +363 @@
 # (PORTME)
 #
-SUFF_DEP            := .dep
-if1of ($(BUILD_TARGET),win nt os2)
-SUFF_OBJ            := .obj
-SUFF_LIB            := .lib
-SUFF_DLL            := .dll
-SUFF_EXE            := .exe
-SUFF_SYS            := .sys
-SUFF_RES            := .res
-endif
-ifeq ($(BUILD_TARGET),l4)
-SUFF_OBJ            := .o
-SUFF_LIB            := .a
-SUFF_DLL            := .s.so
-SUFF_EXE            :=
-SUFF_SYS            := .a
-SUFF_RES            :=
-endif
-ifeq ($(BUILD_TARGET),darwin)
-SUFF_OBJ            := .o
-SUFF_LIB            := .a
-SUFF_DLL            := .dylib
-SUFF_EXE            :=
-SUFF_SYS            :=
-SUFF_RES            :=
-endif
-ifndef SUFF_OBJ
-SUFF_OBJ            := .o
-SUFF_LIB            := .a
-SUFF_DLL            := .so
-SUFF_EXE            :=
-SUFF_SYS            := .a
-SUFF_RES            :=
+SUFF_DEP    := .dep
+if1of ($(BUILD_TARGET), win nt os2)
+SUFF_OBJ    := .obj
+SUFF_LIB    := .lib
+SUFF_DLL    := .dll
+SUFF_EXE    := .exe
+SUFF_SYS    := .sys
+SUFF_RES    := .res
+else ifeq ($(BUILD_TARGET),l4)
+SUFF_OBJ    := .o
+SUFF_LIB    := .a
+SUFF_DLL    := .s.so
+SUFF_EXE    :=
+SUFF_SYS    := .a
+SUFF_RES    :=
+else ifeq ($(BUILD_TARGET),darwin)
+SUFF_OBJ    := .o
+SUFF_LIB    := .a
+SUFF_DLL    := .dylib
+SUFF_EXE    :=
+SUFF_SYS    :=
+SUFF_RES    :=
+else
+SUFF_OBJ    := .o
+SUFF_LIB    := .a
+SUFF_DLL    := .so
+SUFF_EXE    :=
+ if1of ($(BUILD_TARGET), freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
+SUFF_SYS   := .ko
+ else
+SUFF_SYS   :=
+ else
+SUFF_RES    :=
 endif
 
@@ -408 +409 @@
 
 DEP_EXT     := $(PATH_KBUILD_BIN)/kDep$(HOSTSUFF_EXE)
-if1of (kDep,$(KMK_BUILTIN))
+if1of (kDep, $(KMK_BUILTIN))
 DEP         := kmk_builtin_kDep
 else
@@ -415 +416 @@
 
 DEP_IDB_EXT := $(PATH_KBUILD_BIN)/kDepIDB$(HOSTSUFF_EXE)
-if1of (kDepIDB,$(KMK_BUILTIN))
+if1of (kDepIDB, $(KMK_BUILTIN))
 DEP_IDB     := kmk_builtin_kDepIDB
 else
@@ -422 +423 @@
 
 DEP_PRE_EXT := $(PATH_KBUILD_BIN)/kDepPre$(HOSTSUFF_EXE)
-if1of (kDepPre,$(KMK_BUILTIN))
+if1of (kDepPre, $(KMK_BUILTIN))
 DEP_PRE     := kmk_builtin_kDepPre
 else
@@ -429 +430 @@
 
 KOBJCACHE_EXT := $(PATH_KBUILD_BIN)/kObjCache$(HOSTSUFF_EXE)
-if1of (kObjCache,$(KMK_BUILTIN))
+if1of (kObjCache, $(KMK_BUILTIN))
 KOBJCACHE   := kmk_builtin_kObjCache
 else
@@ -469 +470 @@
 
 REDIRECT_EXT:= $(PATH_KBUILD_BIN)/kmk_redirect$(HOSTSUFF_EXE)
-if1of (redirect,$(KMK_BUILTIN))
+if1of (redirect, $(KMK_BUILTIN))
 REDIRECT    := kmk_builtin_redirect
 else