Changeset 1624 in kBuild for trunk/src/ash

Timestamp:

May 12, 2008 9:37:16 PM (17 years ago)

Author:

bird

Message:

flex prep

File:

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

trunk/src/ash/Makefile.kmk

@@ -76 +76 @@
         bltin/test.c \
         $(PATH_TARGET)/arith.c \
-        $(PATH_TARGET)/arith_lex.c \
         $(PATH_TARGET)/builtins.c \
         $(PATH_TARGET)/init.c \
@@ -115 +114 @@
 #       ash.1.gz=>sh.1
 
-
-
-ifeq ($(filter-out nt win win32 win64,$(KBUILD_TARGET)),)
+if1of ($(KBUILD_TARGET), win nt)
 
 #
 # Use the pregenerated code.
 #
-kmk_ash_DEPS :=Ä
+kmk_ash_DEPS :=
+kmk_ash_SOURCES += $(PATH_TARGET)/arith_lex.c
 
 define def_copy_generated
@@ -137 +135 @@
 
 else
+
+ifeq (1,2) #disabled for now.
+kmk_ash_USES = lex #yacc
+kmk_ash_SOURCES += arith_lex.l
+kmk_ash_LEXTOOL = FLEX
+kmk_ash_LEXFLAGS = -8
+else
+kmk_ash_SOURCES += $(PATH_TARGET)/arith_lex.c
+endif
 
 include $(FILE_KBUILD_FOOTER)
@@ -158 +165 @@
         $(MV) -f y.tab.h $(PATH_TARGET)/arith.h
 
+ifndef kmk_ash_LEXTOOL
 $(PATH_TARGET)/arith_lex.c: arith_lex.l | $(call DIRDEP,$(PATH_TARGET))
         flex -8 -o$@ $^                     # 8-bit lex scanner for arithmetic
+endif
 
 $(PATH_TARGET)/builtins.h + $(PATH_TARGET)/builtins.c: $(PATH_CURRENT)/mkbuiltins shell.h builtins.def | $(call DIRDEP,$(PATH_TARGET))