Changeset 3481 for trunk

Timestamp:

Jun 17, 2007, 11:27:09 PM (18 years ago)

Author:

bird

Message:

Some more bootstrap hacking.

File:

• trunk/essentials/Makefile.kmk (modified) (3 diffs)

trunk/essentials/Makefile.kmk

@@ -31 +31 @@
 include $(PATH_KBUILD)/header.kmk
 
-## SUBDIRS                                                                                      
-# The subdirectories to traverse depth first.
-SUBDIRS = \
+## BOOTSTRAPPING_SUBDIRS                                                                                        
+# The bootstrapping subdirectories to traverse depth first.
+BOOTSTRAPPING_SUBDIRS = \
         sys-devel/make \
         sys-devel/flex \
@@ -59 +59 @@
         app-arch/tar \
         app-shells/bash \
+
+#       sys-devel/automake-1.10 - either it depends on libtool or it's not working here...
+                                        
+## NOT_BOOTSTRAPPING_SUBDIRS
+# The not bootstrapping subdirectories to traverse depth first.
+NOT_BOOTSTRAPPING_SUBDIRS = \
         app-arch/gzip \
-        \
         dev-lang/perl \
         dev-lang/python \
         net-misc/wget \
-        sys-apps/portage
-        
+        sys-apps/portage \
 
-#       sys-devel/automake-1.10 - either it depends on libtool or it's not working here...
 
 ## def_do_subdir
@@ -76 +79 @@
 # build and install
 subdir_$(subdir)_all:
-        +$$(MAKE) -C $(subdir)
+        +$$(MAKE) -C $(subdir) $(make_extra) $(def_target)
 
 # install
 subdir_$(subdir)_install:
-        +$$(MAKE) -C $(subdir) install
+        +$$(MAKE) -C $(subdir) $(make_extra) install
 
 # packing
 subdir_$(subdir)_packing:
-        +$$(MAKE) -C $(subdir) packing
+        +$$(MAKE) -C $(subdir) $(make_extra) packing
 
 .NOTPARALLEL: subdir_$(subdir)_all subdir_$(subdir)_install subdir_$(subdir)_packing
 endef
 
-$(foreach subdir,$(SUBDIRS),$(eval $(def_do_subdir)))
+def_target := all
+make_extra :=
+$(foreach subdir,$(BOOTSTRAPPING_SUBDIRS),$(eval $(def_do_subdir)))
+
+# not bootstrapping. 
+def_target := all
+make_extra := NOT_BOOTSTRAPPING_KNIX=1
+$(foreach subdir,$(NOT_BOOTSTRAPPING_SUBDIRS),$(eval $(def_do_subdir)))
 
 #
 # A pass
 #                       
-all_subdirs: | $(foreach subdir,$(SUBDIRS), subdir_$(subdir)_all)
+all_subdirs: | $(foreach subdir,$(BOOTSTRAPPING_SUBDIRS) $(NOT_BOOTSTRAPPING_SUBDIRS), subdir_$(subdir)_all)
         
 .NOTPARALLEL: all_subdirs