Changeset 2390 in kBuild

Timestamp:

Feb 14, 2010 10:52:14 PM (15 years ago)

Author:

bird

Message:

kash: windows build fix.

File:

• trunk/src/kash/Makefile.kmk (modified) (7 diffs)

trunk/src/kash/Makefile.kmk

@@ -51 +51 @@
 kash_DEFS.freebsd = \
         HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
-kash_INCS = $(PATH_kash) . # (the last is because of error.h)
+kash_INCS = $(kash_0_OUTDIR) . # (the last is because of error.h)
 kash_ASFLAGS.win = -g cv8
 kash_ASFLAGS.win.x86   = -f win32
@@ -86 +86 @@
         bltin/test.c \
         \
-        $(PATH_kash)/builtins.c \
-        $(PATH_kash)/init.c \
-        $(PATH_kash)/nodes.c \
+        $(kash_0_OUTDIR)/builtins.c \
+        $(kash_0_OUTDIR)/init.c \
+        $(kash_0_OUTDIR)/nodes.c \
         \
         setmode.c \
@@ -108 +108 @@
 
 kash_INTERMEDIATES = \
-        $(PATH_kash)/builtins.h \
-        $(PATH_kash)/nodes.h \
-        $(PATH_kash)/token.h
+        $(kash_0_OUTDIR)/builtins.h \
+        $(kash_0_OUTDIR)/nodes.h \
+        $(kash_0_OUTDIR)/token.h
 kash_CLEAN = \
         $(kash_INTERMEDIATES) \
-        $(PATH_kash)/builtins.c \
-        $(PATH_kash)/init.c \
-        $(PATH_kash)/nodes.c
+        $(kash_0_OUTDIR)/builtins.c \
+        $(kash_0_OUTDIR)/init.c \
+        $(kash_0_OUTDIR)/nodes.c
 
 ##
@@ -133 +133 @@
         $(kash_0_OUTDIR)/arith.c \
         $(kash_0_OUTDIR)/arith_lex.c
+kash_INTERMEDIATES += \
+        $(kash_0_OUTDIR)/arith.h
 
 define def_copy_generated
-$$(kash_0_OUTDIR)/$(src): $(PATH_SUB_CURRENT)/generated/$(src)
+$$$$(kash_0_OUTDIR)/$(src): $(PATH_SUB_CURRENT)/generated/$(src)
         $$(RM) -f $$@
         $$(CP) -f $$^ $$@
@@ -170 +172 @@
 BOOTSTRAP_SHELL ?= $(SHELL)
 
-$$(PATH_kash)/builtins.h + $$(PATH_kash)/builtins.c: \
+$$(kash_0_OUTDIR)/builtins.h + $$(kash_0_OUTDIR)/builtins.c: \
                 $$(kash_DEFPATH)/mkbuiltins \
                 $$(kash_DEFPATH)/shell.h \
@@ -176 +178 @@
                 | $$(dir $$@)
         $(BOOTSTRAP_SHELL) $+ $(dir $@)
-        [ -f $(PATH_kash)/builtins.h ]
-
-$$(PATH_kash)/nodes.h + $$(PATH_kash)/nodes.c: \
+        [ -f $(kash_0_OUTDIR)/builtins.h ]
+
+$$(kash_0_OUTDIR)/nodes.h + $$(kash_0_OUTDIR)/nodes.c: \
         $$(kash_DEFPATH)/mknodes.sh \
         $$(kash_DEFPATH)/nodetypes \
@@ -186 +188 @@
         [ -f $(dir $@)/nodes.h ]
 
-$$(PATH_kash)/token.h: $$(kash_DEFPATH)/mktokens | $$(dir $$@)
+$$(kash_0_OUTDIR)/token.h: $$(kash_DEFPATH)/mktokens | $$(dir $$@)
         $(BOOTSTRAP_SHELL) $+
         $(MV) token.h $@
 
-$$(PATH_kash)/init.c: \
+$$(kash_0_OUTDIR)/init.c: \
                 $$(kash_DEFPATH)/mkinit.sh \
-                $$(abspathex $$(filter-out $$(PATH_kash)/%,$$(kash_SOURCES)), $$(kash_DEFPATH)) \
+                $$(abspathex $$(filter-out $$(kash_0_OUTDIR)/%,$$(kash_SOURCES)), $$(kash_DEFPATH)) \
                 | $$(dir $$@)
         $(BOOTSTRAP_SHELL) $+