epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Simplify changes to create <name>Include.dbd from <name>_DBD files.

Browse Source
This commit is contained in:
Janet B. Anderson
2004-03-25 17:09:58 +00:00
parent d80664f33f
commit 26b6974cfa
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure/RULES.Db
View File

@@ -11,8 +11,7 @@
##################################################### vpath
vpath %.dbd $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DBD)) $(COMMON_DIR) \
$(subst -I,,$(RELEASE_DBDFLAGS))
vpath %.dbd $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DBD)) $(COMMON_DIR)
vpath %.db $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
vpath %.vdb $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
vpath %.substitutions $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
@@ -207,6 +206,13 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
@$(RM) $@
$(MAKEBPT) $< $@
$(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd
@$(RM) $@$(DEP)
@$(DBDDEPENDS_CMD)
@echo "Expanding dbd"
@$(RM) $@
$(DBEXPAND) $(DBDFLAGS) -o $@ $<
$(COMMON_DIR)/%.dbd: %Include.dbd
@$(RM) $@$(DEP)
@$(DBDDEPENDS_CMD)

2
configure/RULES_BUILD
View File

@@ -79,7 +79,7 @@ ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
MakefileInclude: ../Makefile
@$(RM) $@
@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) $(DBD) $@
@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) $@
-include MakefileInclude

8
configure/tools/makeMakefileInclude.pl
View File

@@ -39,7 +39,6 @@ print OUT "#Do not modify this file.\n";
print OUT "#This file is created during the build.\n";
foreach $name ( @nameList ) {
if ( $name !~ m/\.dbd$/ ) {
print OUT "\n";
print OUT "ifneq (\$(strip \$(${name}_SRCS_\$(OS_CLASS))),)\n";
print OUT "${name}_SRCS+=\$(subst -nil-,,\$(${name}_SRCS_\$(OS_CLASS)))\n";
@@ -159,13 +158,6 @@ foreach $name ( @nameList ) {
print OUT "\$(LOADABLE_SHRLIB_PREFIX)${name}\$(LOADABLE_SHRLIB_SUFFIX):\$(${name}_DLL_DEPLIBS)\n";
print OUT "endif\n";
print OUT "\n";
} else {
print OUT "ifneq (\$(\$(patsubst %.dbd,%,${name})_DBD),)\n";
print OUT "${name}:\$(patsubst %.dbd,\$(COMMON_DIR)\/%Include.dbd,${name})\n";
print OUT "\$(patsubst %.dbd,\$(COMMON_DIR)\/%Include.dbd,${name}):\$(\${patsubst %.dbd,%,${name}}_DBD)\n";
print OUT "endif\n";
print OUT "\n";
}
}
close OUT or die "Cannot close $outfile: $!";