Changeset 268 for trunk/src/gmake

Timestamp:

May 6, 2005, 5:48:04 AM (20 years ago)

Author:

bird

Message:

More proper makefiles, now building on os/2 too.

File:

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

trunk/src/gmake/Makefile.kmk

@@ -1 +1 @@
 # $Id$
-export KBUILD_VCC70_DEPS = 1
 
-PROGRAMS            = kmk
-PROGRAMS           += echo mkdir rm
 
-TOOL                = GCC3
-TOOL.os2            = GCC3OMF
-TOOL.win32          = VCC70
+#
+# kmk
+#
+PROGRAMS           += kmk
 
-CFLAGS.linux.release= -O3
-CFLAGS.os2.relase   = -O3
-CFLAGS.win32        = -MT -W3
-
-LDFLAGS.linux.release       = -s
-LDFLAGS.os2                 = -Zhigh-mem -Zstack=1024
-LDFLAGS.os2.release         = -s
-LDFLAGS.win32               = /SUBSYSTEM:console /INCREMENTAL:no /NOD
-
-LIBS.linux              = rt
-LIBS.win32              = \
-        $(PATH_DEV)/x86.win32/vcc70/lib/libcmt.lib \
-        $(PATH_DEV)/x86.win32/vcc70/lib/oldnames.lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/User32.Lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/AdvAPI32.Lib
-
+kmk_TEMPLATE        = BIN
 kmk_DEPS            = $(PATH_TARGET)/config.h
-
 kmk_INCS            = $(PATH_TARGET) .
-kmk_INCS.win32      = \
-        w32/include \
-        glob \
-        $(PATH_DEV)/x86.win32/vcc70/include \
-        $(PATH_DEV)/x86.win32/sdk200209/include
 
 kmk_DEFS            = \
@@ -43 +19 @@
         CONFIG_NO_DEFAULT_VARIABLES \
         CONFIG_WITH_KMK_BUILTIN
-kmk_DEFS.win32          = WINDOWS32 _CONSOLE WIN32
-kmk_DEFS.win32.release  = NDEBUG
         
 kmk_SOURCES         = \
@@ -67 +41 @@
         version.c \
         vpath.c \
-        remote-stub.c \
+        remote-stub.c
+
+kmk_SOURCES        += \
         kmkbuiltin.c \
         kmkbuiltin/echo.c \
         kmkbuiltin/mkdir.c \
         kmkbuiltin/rm.c \
+        kmkbuiltin/cp.c \
+        kmkbuiltin/cp_utils.c \
         \
         kmkbuiltin/setmode.c \
@@ -92 +70 @@
         w32/pathstuff.c
 
-#MAKE_DLLSHELL
 
+#
+# Standalone kmkbuiltin commands.
+#
+PROGRAMS += cp echo mkdir rm
+
+cp_TEMPLATE = BIN
+cp_DEFS = kmk_builtin_cp=main
+cp_SOURCES = \
+        kmkbuiltin/cp.c \
+        kmkbuiltin/cp_utils.c
+
+echo_TEMPLATE = BIN
 echo_DEFS = kmk_builtin_echo=main
 echo_SOURCES = \
         kmkbuiltin/echo.c
 
+mkdir_TEMPLATE = BIN
 mkdir_DEFS = kmk_builtin_mkdir=main
 mkdir_SOURCES = \
@@ -103 +93 @@
         kmkbuiltin/setmode.c
 
+rm_TEMPLATE = BIN
 rm_DEFS = kmk_builtin_rm=main
 rm_SOURCES = \
@@ -110 +101 @@
 
 
-
 DEPTH = ../..
 include $(PATH_KBUILD)/rules.kmk
 
+                        
+#
+# Use checked in config.h instead of running ./Configure for it.
+#                       
 $(PATH_TARGET)/config.h: config.h.$(BUILD_TARGET)
         $(CP) $^ $@
 
+
+#
+# Some tests.
+#
 parallel: parallel_1 parallel_2 parallel_3 parallel_4 parallel_5
 parallel_1 parallel_2 parallel_3 parallel_4 parallel_5: