Updated concatenated database definition files

This commit is contained in:
Janet Anderson
2014-09-11 15:18:57 -05:00
parent 069a40ac46
commit 840669563c
3 changed files with 10 additions and 6 deletions

View File

@@ -52,9 +52,13 @@ DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
COMMON_DBDCATS += $(addprefix $(COMMON_DIR)/,$(DBDCAT))
DBDCAT_SOURCES += $(foreach file, $($*_DBD), $(DBDCAT_SOURCE) )
DBDCAT_SOURCE = $(firstword $(wildcard $(file) $(foreach dir, \
$(GENERIC_SRC_DIRS),$(addsuffix /$(file),$(dir)))) \
$(DBD_SEARCH_DIRS),$(addsuffix /$(file),$(dir)))) \
$(COMMON_DIR)/$(file))
DBDCAT_COMMAND = $(if $(DBDCAT_SOURCES),\
$(CAT) $(DBDCAT_SOURCES) > $(notdir $@),\
@echo "No input files for $(notdir $@)")
INSTALL_DBDS += $(addprefix $(INSTALL_DBD)/,$(DBDCAT))
# ---------------------------------------------------
@@ -388,8 +392,7 @@ $(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name)))
$(COMMON_DBDCATS):$(COMMON_DIR)/%.dbd:
$(ECHO) "Creating dbd file $(notdir $@)"
@$(RM) $(notdir $@)
$(CAT) $(DBDCAT_SOURCES) > $(notdir $@)
#@$(CAT) $^ > $(notdir $@)
$(DBDCAT_COMMAND)
@$(MV) $(notdir $@) $@
$(COMMON_DIR)/%.dbd:

View File

@@ -30,8 +30,9 @@ expansions will be done.
</pre></blockquote>
The files file1.dbd, file2.dbd, and file3.dbd will be found if they exist in the
current directory, are created by the current Makefile, have fullpath name ,or
exist in a directory of the currently defined SRC_DIRS list.</p>
current directory, are created by the current Makefile, have fullpath name , exist
in a directory of the currently defined SRC_DIRS list, exist in the install dbd
directory, or exist in a dbd directory of a current release module..</p>
<h3>On POSIX, attempt to lock all memory when running with FIFO scheduler</h3>

View File

@@ -34,7 +34,7 @@ if ($opt_D) {
$dep = "\$(COMMON_DIR)/$dep";
}
exit 0 if (!@ARGV);
die "No input files for $opt_o" if (!@ARGV);
while (@ARGV) {
my $file = shift @ARGV;