Changeset 1784 in kBuild for trunk/src/kash/Makefile.kmk

Timestamp:

Sep 13, 2008 3:27:59 AM (16 years ago)

Author:

bird

Message:

kash: hacking.

File:

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

trunk/src/kash/Makefile.kmk

@@ -38 +38 @@
 kash_DEFS.linux = BSD
 kash_DEFS.solaris = BSD
+## @todo bring over PC_SLASHES?
 kash_DEFS.win = \
         BSD PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS YY_NO_UNISTD_H
@@ -50 +51 @@
         HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
 kash_INCS = $(PATH_kash) . # (the last is because of error.h)
+if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win"
+kash_CFLAGS += -std=gnu99
+endif
 kash_SOURCES = \
         main.c \
@@ -97 +101 @@
         strlcpy.c
 
-kash_ORDERDEPS = \
+kash_INTERMEDIATES = \
         $(PATH_kash)/arith.h \
         $(PATH_kash)/builtins.h \
@@ -103 +107 @@
         $(PATH_kash)/token.h
 kash_CLEAN = \
-        $(kash_ORDERDEPS)       \
+        $(kash_INTERMEDIATES) \
         $(PATH_kash)/arith.c \
         $(PATH_kash)/arith_lex.c \
@@ -118 +122 @@
 
 
-ifeq ($(filter-out win,$(KBUILD_TARGET)),)
+if1of ($(KBUILD_TARGET), win)
 
 #
@@ -127 +131 @@
 kash_SOURCES := $(patsubst $(PATH_kash)/%,generated/%,$(kash_SOURCES))
 
-include $(FILE_KBUILD_SUB_FOOTER)
-
 else
-
-include $(FILE_KBUILD_SUB_FOOTER)
 
 #
@@ -142 +142 @@
 #
 BOOTSTRAP_SHELL ?= $(SHELL)
-YACC ?= yacc
+ifndef YACC
+ YACC := $(firstword $(which byacc) $(which yacc) yacc)
+endif
 
-$(PATH_kash)/arith.h $(PATH_kash)/arith.c: arith.y | $(call DIRDEP,$(PATH_kash))
+$$(PATH_kash)/arith.h + $$(PATH_kash)/arith.c: arith.y | $$(dir $$@)
         $(YACC) -ld $^
         $(MV) -f y.tab.c $(PATH_kash)/arith.c
         $(MV) -f y.tab.h $(PATH_kash)/arith.h
 
-$(PATH_kash)/arith_lex.c: arith_lex.l | $(call DIRDEP,$(PATH_kash))
+$$(PATH_kash)/arith_lex.c: $$(kash_DEFPATH)/arith_lex.l | $$(dir $$@)
         flex -8 -o$@ $^                     # 8-bit lex scanner for arithmetic
 
-$(PATH_kash)/builtins.h $(PATH_kash)/builtins.c: $(kash_PATH)/mkbuiltins shell.h builtins.def | $(call DIRDEP,$(PATH_kash))
+$$(PATH_kash)/builtins.h + $$(PATH_kash)/builtins.c: \
+                $$(kash_DEFPATH)/mkbuiltins \
+                $$(kash_DEFPATH)/shell.h \
+                $$(kash_DEFPATH)/builtins.def \
+                | $$(dir $$@)
         $(BOOTSTRAP_SHELL) $+ $(dir $@)
         [ -f $(PATH_kash)/builtins.h ]
 
-$(PATH_kash)/nodes.h $(PATH_kash)/nodes.c: $(kash_PATH)/mknodes.sh nodetypes nodes.c.pat | $(call DIRDEP,$(PATH_kash))
+$$(PATH_kash)/nodes.h + $$(PATH_kash)/nodes.c: \
+        $$(kash_DEFPATH)/mknodes.sh \
+        $$(kash_DEFPATH)/nodetypes \
+        $$(kash_DEFPATH)/nodes.c.pat \
+        | $$(dir $$@)
         $(BOOTSTRAP_SHELL) $+ $(dir $@)
         [ -f $(dir $@)/nodes.h ]
 
-$(PATH_kash)/token.h: $(kash_PATH)/mktokens | $(call DIRDEP,$(PATH_kash))
+$$(PATH_kash)/token.h: $$(kash_DEFPATH)/mktokens | $$(dir $$@)
         $(BOOTSTRAP_SHELL) $+
         $(MV) token.h $@
 
-$(PATH_kash)/init.c: $(kash_PATH)/mkinit.sh $(filter-out $(PATH_kash)/%,$(kash_SOURCES)) | $(call DIRDEP,$(PATH_kash))
+$$(PATH_kash)/init.c: \
+                $$(kash_DEFPATH)/mkinit.sh \
+                $$(abspathex $$(filter-out $$(PATH_kash)/%,$$(kash_SOURCES)), $$(kash_DEFPATH)) \
+                | $$(dir $$@)
         $(BOOTSTRAP_SHELL) $+
         $(MV) init.c $@
 
 endif
+
+include $(FILE_KBUILD_SUB_FOOTER)
+