--- a/sbsv2/raptor/lib/flm/build.flm Mon Nov 16 09:46:46 2009 +0000
+++ b/sbsv2/raptor/lib/flm/build.flm Mon Nov 16 20:39:37 2009 +0000
@@ -24,36 +24,31 @@
.PHONY:: PP_EXPORTS
+ifneq ($(filter win,$(HOSTPLATFORM)),)
+SBS:=$(subst \,/,$(SBS_HOME)/bin/sbs.bat)
+else
+SBS:=$(SBS_HOME)/bin/sbs
+endif
-SBS := $(subst \,/,$(SBS_HOME)/bin/sbs)
define doexports
PP_EXPORTS::
$(call startrule,makefile_generation_exports) \
- export TALON_DESCRAMBLE=0; \
- $(SBS) --export-only $(component_list) $(config_list) -f- -m $(SBS_BUILD_DIR)/makefiles_export.mk $(cli_options) --mo=DESCRAMBLE:= --mo=TALON_DESCRAMBLE:=0 | $(GNUSED) 's#]I*]>#XXX#' \
+ $(SBS) --pp=slave --toolcheck=off --export-only $(component_list) $(config_list) -f- -m $(MAKEFILE_PATH).exports $(cli_options) \
$(call endrule,makefile_generation_exports)
-CLEANTARGETS:=$$(CLEANTARGETS) $(SBS_BUILD_DIR)/makefiles_export.mk
+CLEANTARGETS:=$$(CLEANTARGETS) $(MAKEFILE_PATH).exports
endef
# Generate makefiles for particular bldinf
# $(1) = source target source target......
define generate_makefiles
-$$(info XXX component_list=$(COMPONENT_PATHS) makefile=$(MAKEFILE_PATH))
-
-ifeq ($(NO_BUILD),1)
ALL:: $(MAKEFILE_PATH)
-else
-include $(MAKEFILE_PATH)
-endif
$(MAKEFILE_PATH): $(COMPONENT_PATHS) | PP_EXPORTS
$(call startrule,makefile_generation) \
- export TALON_DESCRAMBLE=0; \
- $(SBS) --toolcheck=off -n $(CLI_OPTIONS) $(component_list) $(config_list) -m $$@ -f- --mo=DESCRAMBLE:= --mo=TALON_DESCRAMBLE:=0 | $(GNUSED) 's#\]\][>]#XXX#' && \
- $(MAKE) -j 8 -f $$@.resource_deps \
+ $(SBS) --pp=slave --toolcheck=off -n $(CLI_OPTIONS) $(component_list) $(config_list) -m $$@ -f- \
$(call endrule,makefile_generation)
CLEANTARGETS:=$$(CLEANTARGETS) $(MAKEFILE_PATH)
@@ -63,13 +58,15 @@
# Create config list for commands
config_list:=$(addprefix -c ,$(CONFIGS))
component_list:=$(addprefix -b ,$(COMPONENT_PATHS))
-$(info COMFIG_LIST: $(config_list))
+$(info <debug>build.flm: configlist: $(config_list)</debug>)
$(eval $(doexports))
# Create the Makefiles
$(eval $(call generate_makefiles))
+CREATABLEPATHS:=$(CREATABLEPATHS) $(dir $(MAKEFILE_PATH))
+
$(eval $(call GenerateStandardCleanTarget,$(CLEANTARGETS),$(CREATABLEPATHS),))
$(call makepath,$(CREATABLEPATHS))