Changeset 523 in kBuild

Timestamp:

Sep 16, 2006 6:22:18 AM (18 years ago)

Author:

bird

Message:

Added kmk_gmake which is (almost) vanilla GNU Make.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• src/gmake/Makefile.kmk (modified) (5 diffs)

trunk/ChangeLog

@@ -3 +3 @@
 2006-09-16:
     - src/gmake:
+        o Added kmk_gmake which is (almost) vanilla GNU Make.
         o kmk_ash wants batch files on windows or the double quotes will get screwed up.
         o Make sure kmk_builtin commands don't get batch files and odd weird stuff.

trunk/src/gmake/Makefile.kmk

@@ -5 +5 @@
 # kmk
 #
-PROGRAMS           += kmk
-
-kmk_TEMPLATE        = BIN
-kmk_DEPS            = $(PATH_TARGET)/config.h
-kmk_DEFS.win32      = __WIN32__
-kmk_INCS            = $(PATH_TARGET) .
+PROGRAMS += kmk
+
+kmk_TEMPLATE = BIN
+kmk_DEPS = $(PATH_TARGET)/config.h
+kmk_INCS = $(PATH_TARGET) .
 #kmk_INCS.win32      = kmkbuiltin/w32
 
-kmk_DEFS            = \
+kmk_DEFS = \
         HAVE_CONFIG_H \
-    NO_ARCHIVES \
+        NO_ARCHIVES \
         CONFIG_NO_DEFAULT_SUFFIXES \
         CONFIG_NO_DEFAULT_PATTERN_RULES \
@@ -21 +20 @@
         CONFIG_NO_DEFAULT_SUFFIX_RULES \
         CONFIG_NO_DEFAULT_VARIABLES \
-    CONFIG_WITH_EXTENDED_NOTPARALLEL \
-    CONFIG_WITH_TOUPPER_TOLOWER \
+        CONFIG_WITH_EXTENDED_NOTPARALLEL \
+        CONFIG_WITH_TOUPPER_TOLOWER \
         KMK \
         VARIABLE_HASH
         
-        
-kmk_SOURCES         = \
+kmk_SOURCES = \
         main.c \
         read.c \
@@ -65 +63 @@
 kmk_SOURCES.freebsd = \
         glob/glob.c \
-        glob/fnmatch.c \
+        glob/fnmatch.c
 
 #
@@ -109 +107 @@
         kmkbuiltin/cp.c \
         kmkbuiltin/cp_utils.c \
-    kmkbuiltin/strlcpy.c \
+        kmkbuiltin/strlcpy.c \
         kmkbuiltin/err.c
 kmk_cp_INCS.win32 = $(PATH_TARGET) .
@@ -179 +177 @@
         getopt.c \
         getopt1.c
+
+
+#
+# kmk_gmake - almost plain GNU Make.
+#
+PROGRAMS += kmk_gmake
+kmk_gmake_TEMPLATE = BIN
+kmk_gmake_DEPS = $(PATH_TARGET)/config.h
+kmk_gmake_INCS = $(PATH_TARGET) .
+
+kmk_gmake_DEFS = \
+        HAVE_CONFIG_H \
+        NO_ARCHIVES \
+        CONFIG_WITH_TOUPPER_TOLOWER
+        
+kmk_gmake_SOURCES = \
+        main.c \
+        read.c \
+        hash.c \
+        strcache.c \
+        variable.c \
+        ar.c \
+        arscan.c \
+        commands.c \
+        default.c \
+        dir.c \
+        expand.c \
+        file.c \
+        function.c \
+        implicit.c \
+        job.c \
+        misc.c \
+        remake.c \
+        rule.c \
+        signame.c \
+        version.c \
+        vpath.c \
+        remote-stub.c
+
+kmk_gmake_SOURCES.win32 = \
+        getopt.c \
+        getopt1.c \
+        getloadavg.c \
+        w32/subproc/misc.c \
+        w32/subproc/sub_proc.c \
+        w32/subproc/w32err.c \
+        glob/glob.c \
+        glob/fnmatch.c \
+        w32/compat/dirent.c \
+        w32/pathstuff.c
+
+kmk_gmake_SOURCES.freebsd = \
+        glob/glob.c \
+        glob/fnmatch.c
+