Changeset 3140 in kBuild for trunk/src/kmk/Makefile.kmk

Timestamp:

Mar 14, 2018 9:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• Makefile.kmk (modified) (10 diffs)

trunk/src/kmk/Makefile.kmk

@@ -54 +54 @@
 TEMPLATE_BIN-KMK_CFLAGS.win.amd64 = $(TEMPLATE_BIN-THREADED_CFLAGS.win.amd64) -wd4244 -wd4267
 TEMPLATE_BIN-KMK_CLEAN.win = $(TEMPLATE_BIN-KMK_DEPS.win)
+TEMPLATE_BIN-KMK_DEFS.debug = $(TEMPLATE_BIN-KMK_DEPS.debug) MAKE_MAINTAINER_MODE
 TEMPLATE_BIN-KMK_INCS = $(kmk_0_OUTDIR) . $(TEMPLATE_BIN-THREADED_INCS)
 ifneq ($(KBUILD_TARGET),os2)
@@ -144 +145 @@
         w32/subproc/w32err.c \
         w32/pathstuff.c \
-        w32/imagecache.c
+        w32/imagecache.c \
+        w32/compat/posixfcn.c
 
 #
@@ -213 +215 @@
 kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS
 kmk_DEFS.amd64 = CONFIG_WITH_OPTIMIZATION_HACKS
-kmk_DEFS.win = CONFIG_NEW_WIN32_CTRL_EVENT CONFIG_WITH_FAST_IS_SPACE
+kmk_DEFS.win = CONFIG_NEW_WIN32_CTRL_EVENT
 kmk_DEFS.debug = CONFIG_WITH_MAKE_STATS
 ifdef CONFIG_WITH_MAKE_STATS
@@ -241 +243 @@
         job.c \
         misc.c \
+        output.c \
         remake.c \
         rule.c \
@@ -247 +250 @@
         vpath.c \
         remote-stub.c \
+        guile.c \
+        load.c \
        \
         alloccache.c \
@@ -256 +261 @@
         kbuild-object.c
 ifeq ($(KBUILD_TARGET),win)
- kmk_SOURCES += dir-nt-bird.c
+ kmk_SOURCES += \
+        dir-nt-bird.c \
+        w32/w32os.c
 else
- kmk_SOURCES += dir.c
+ kmk_SOURCES += \
+        dir.c \
+        posixos.c
 endif
 
@@ -481 +490 @@
         job.c \
         misc.c \
+        output.c \
         remake.c \
         rule.c \
@@ -486 +496 @@
         version.c \
         vpath.c \
-        remote-stub.c
+        remote-stub.c \
+        guile.c \
+        load.c
+ifeq ($(KBUILD_TARGET),win)
+ kmk_gmake_SOURCES += \
+        w32/w32os.c
+else
+ kmk_gmake_SOURCES += \
+        posixos.c
+endif
 
 kmk_gmake_SOURCES.win = \
@@ -533 +552 @@
         job.c \
         misc.c \
+        output.c \
         alloccache.c \
         remake.c \
@@ -539 +559 @@
         version.c \
         vpath.c \
-        remote-stub.c
+        remote-stub.c \
+        guile.c \
+        load.c
+ifeq ($(KBUILD_TARGET),win)
+ kmk_fgmake_SOURCES += \
+        w32/w32os.c
+# @todo: dir-nt-bird.c for fgmake
+else
+ kmk_fgmake_SOURCES += \
+        posixos.c
+endif
 
 kmk_fgmake_SOURCES.win = \