Changeset 3297

Timestamp:

May 6, 2007, 1:41:20 AM (18 years ago)

Author:

bird

Message:

Some cleanup fixes and incorrect dependencies.

File:

• trunk/essentials/app-shells/bash/kNIX-bootstrap.kmk (modified) (5 diffs)

trunk/essentials/app-shells/bash/kNIX-bootstrap.kmk

@@ -55 +55 @@
         $(PATH_TARGET)/pathnames.h
 
+OTHER_CLEAN += $(TEMPLATE_bash_ORDERDEPS)
+
 #
 # bash
@@ -60 +62 @@
 PROGRAMS += bash
 bash_TEMPLATE = bash
-bash_ORDERDEPS = $(PATH_TARGET)/builtins/builtext.h
 bash_INCS = $(PATH_SUB_ROOT)/builtins $(PATH_TARGET)/builtins
 BUILTINS = \
@@ -171 +172 @@
         ncurses
 
+bash_ORDERDEPS = \
+        $(PATH_TARGET)/builtins/builtext.h \
+        $(PATH_TARGET)/builtins/builtins.c
+
+bash_CLEAN = \
+        $(bash_ORDERDEPS) \
+    $(PATH_TARGET)/syntax.c \
+        $(PATH_TARGET)/builtins/builtins.c \
+        $(addprefix $(PATH_TARGET)/builtins/, $(BUILTINS:.def=.c))
+
 
 # generate syntax.c.
-$(PATH_TARGET)/syntax.c: $(TARGET_mksyntax)
+$(PATH_TARGET)/syntax.c: $$(TARGET_mksyntax)
         $(TARGET_mksyntax) -o $@
 
 # generate signames.h for trap.c
-$(PATH_TARGET)/signames.h: $(TARGET_mksignames)
+$(PATH_TARGET)/signames.h: $$(TARGET_mksignames)
         $(TARGET_mksignames) $@
 
@@ -187 +198 @@
 # generate builtext.h and builtins.c from the builtins/*.def files.
 $(PATH_TARGET)/builtins/builtext.h $(PATH_TARGET)/builtins/builtins.c: \
-                $(addprefix $(PATH_SUB_ROOT)/builtins/, $(BUILTINS)) \
-                $(TARGET_mkbuiltins)
+                $$(TARGET_mkbuiltins) \
+                $(addprefix $(PATH_SUB_ROOT)/builtins/, $(BUILTINS))
         $(MKDIR) -p $(PATH_TARGET)/builtins
         $(TARGET_mkbuiltins) \
@@ -197 +208 @@
                 $(addprefix $(PATH_SUB_ROOT)/builtins/, $(BUILTINS))
 
+.NOTPARALLEL: $(PATH_TARGET)/builtins/builtext.h $(PATH_TARGET)/builtins/builtins.c
+
 # generate C source files from the builtins/*.def files.
 define def_mkbuiltin
-$(PATH_TARGET)/builtins/$(name:.def=.c): $(PATH_SUB_ROOT)/builtins/$(name) $$(TARGET_mkbuiltins)
+$(PATH_TARGET)/builtins/$(name:.def=.c): $(PATH_SUB_ROOT)/builtins/$(name) $$$$(TARGET_mkbuiltins)
         $(MKDIR) -p $(PATH_TARGET)/builtins
         cd $$(@D) && $$(TARGET_mkbuiltins) -D $(PATH_SUB_ROOT)/builtins $$<
-endef 
+endef
 $(foreach name,$(BUILTINS),$(eval $(def_mkbuiltin)))