Changeset 2224 in kBuild for trunk/src/ash/Makefile.kmk

Timestamp:

Jan 8, 2009 1:19:16 AM (16 years ago)

Author:

bird

Message:

kBuild: Implemented flex and yacc/bison support. Fixes #18.

File:

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

trunk/src/ash/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2005-2008 knut st. osmundsen <[email protected]>
+# Copyright (c) 2005-2009 knut st. osmundsen <[email protected]>
 #
 # This file is part of kBuild.
@@ -77 +77 @@
         bltin/kill.c \
         bltin/test.c \
-        $(PATH_kmk_ash)/arith.c \
         $(PATH_kmk_ash)/builtins.c \
         $(PATH_kmk_ash)/init.c \
@@ -98 +97 @@
 
 kmk_ash_INTERMEDIATES = \
-        $(PATH_kmk_ash)/arith.h \
         $(PATH_kmk_ash)/builtins.h \
         $(PATH_kmk_ash)/nodes.h \
@@ -104 +102 @@
 kmk_ash_CLEAN = \
         $(kmk_ash_INTERMEDIATES) \
-        $(PATH_kmk_ash)/arith.c \
-        $(PATH_kmk_ash)/arith_lex.c \
         $(PATH_kmk_ash)/builtins.c \
         $(PATH_kmk_ash)/init.c \
@@ -140 +136 @@
 #
 
-ifeq (1,2) #disabled for now.
-kmk_ash_USES = lex #yacc
-kmk_ash_SOURCES += arith_lex.l
+USES += lex yacc
+kmk_ash_USES = lex yacc
 kmk_ash_LEXTOOL = FLEX
 kmk_ash_LEXFLAGS = -8
-else
-kmk_ash_SOURCES += $(PATH_kmk_ash)/arith_lex.c
-endif
+#kmk_ash_YACCTOOL = BISON
+kmk_ash_YACCTOOL = YACC
+kmk_ash_YACCFLAGS = -ld
+kmk_ash_SOURCES += \
+        arith.y \
+        arith_lex.l
+
 
 include $(FILE_KBUILD_SUB_FOOTER)
@@ -160 +159 @@
 #
 BOOTSTRAP_SHELL ?= $(SHELL)
-ifndef YACC
- YACC := $(firstword $(which byacc) $(which yacc) yacc)
-endif
-
-$(PATH_kmk_ash)/arith.h + $(PATH_kmk_ash)/arith.c: $(kmk_ash_PATH)/arith.y | $(call DIRDEP,$(PATH_kmk_ash))
-        $(YACC) -ld $^
-        $(MV) -f y.tab.c $(PATH_kmk_ash)/arith.c
-        $(MV) -f y.tab.h $(PATH_kmk_ash)/arith.h
-
-ifndef kmk_ash_LEXTOOL
-$(PATH_kmk_ash)/arith_lex.c: $(kmk_ash_PATH)/arith_lex.l | $(call DIRDEP,$(PATH_kmk_ash))
-        flex -8 -o$@ $^                     # 8-bit lex scanner for arithmetic
-endif
 
 $(PATH_kmk_ash)/builtins.h + $(PATH_kmk_ash)/builtins.c: \
@@ -202 +188 @@
 
 endif # generate on the fly
+