diff --git a/src/makeBaseApp/Makefile.Host b/src/makeBaseApp/Makefile.Host index 679944da0..0fd007862 100644 --- a/src/makeBaseApp/Makefile.Host +++ b/src/makeBaseApp/Makefile.Host @@ -25,9 +25,9 @@ TEMPLATES += top/configure/replaceVAR.pl TEMPLATES += top/exampleApp/Makefile TEMPLATES += top/exampleApp/Db/Makefile +TEMPLATES += top/exampleApp/Db/Makefile.Host TEMPLATES += top/exampleApp/Db/dbExample1.db -TEMPLATES += top/exampleApp/Db/dbExample2.substitutions -TEMPLATES += top/exampleApp/Db/dbExample2.template +TEMPLATES += top/exampleApp/Db/dbExample2.db TEMPLATES += top/exampleApp/src/Makefile TEMPLATES += top/exampleApp/src/Makefile.Host TEMPLATES += top/exampleApp/src/Makefile.Ioc diff --git a/src/makeBaseApp/top/exampleApp/Db/Makefile b/src/makeBaseApp/top/exampleApp/Db/Makefile index cbd81aaa4..77a421bae 100644 --- a/src/makeBaseApp/top/exampleApp/Db/Makefile +++ b/src/makeBaseApp/top/exampleApp/Db/Makefile @@ -1,29 +1,3 @@ TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Optimization of db files using dbst (DEFAULT: NO) -#DB_OPT = YES - -#---------------------------------------------------- -# Optimization needs the name of the appropriate -# dbd file (compare with ../src/Makefile.Vx) -#DBDNAME = exampleApp.dbd - -#---------------------------------------------------- -# Add databases, templates, substitutions like this -DB += dbExample1.db dbExample2.db - -#---------------------------------------------------- -# Declare template files which do not show up in DB -USES_TEMPLATE += dbExample2.template - -#---------------------------------------------------- -# The following line is for local dbd expansion -#DBDEXPAND = _APPNAME_Include.dbd - -include $(TOP)/configure/RULES.Db -#---------------------------------------- -# ADD RULES AFTER THIS LINE +include $(TOP)/configure/CONFIG_APP +include $(TOP)/configure/RULES_ARCHS diff --git a/src/makeBaseApp/top/exampleApp/Db/Makefile.Host b/src/makeBaseApp/top/exampleApp/Db/Makefile.Host new file mode 100644 index 000000000..5bcb6dd83 --- /dev/null +++ b/src/makeBaseApp/top/exampleApp/Db/Makefile.Host @@ -0,0 +1,29 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Optimization of db files using dbst (DEFAULT: NO) +#DB_OPT = YES + +#---------------------------------------------------- +# Optimization needs the name of the appropriate +# dbd file (compare with ../src/Makefile.Vx) +#DBDNAME = exampleApp.dbd + +#---------------------------------------------------- +# Add databases, templates, substitutions like this +DB += dbExample1.db dbExample2.db + +#---------------------------------------------------- +# Declare template files which do not show up in DB +#USES_TEMPLATE += dbExample2.template + +#---------------------------------------------------- +# The following line is for local dbd expansion +#DBDEXPAND = exampleInclude.dbd + +include $(TOP)/configure/RULES.Db +#---------------------------------------- +# ADD RULES AFTER THIS LINE diff --git a/src/makeBaseApp/top/exampleApp/Db/dbExample2.template b/src/makeBaseApp/top/exampleApp/Db/dbExample2.db similarity index 62% rename from src/makeBaseApp/top/exampleApp/Db/dbExample2.template rename to src/makeBaseApp/top/exampleApp/Db/dbExample2.db index 75852b657..836c53d08 100644 --- a/src/makeBaseApp/top/exampleApp/Db/dbExample2.template +++ b/src/makeBaseApp/top/exampleApp/Db/dbExample2.db @@ -1,10 +1,10 @@ -record(calc, "$(USER):calcExample$(NO)") +record(calc, "$(user):calcExample$(no)") { - field(DESC, "Counter No. $(NO)") - field(SCAN,"$(SCAN)") - field(FLNK, "$(USER):aiExample$(NO)") + field(DESC, "Counter No. $(no)") + field(SCAN,"$(scan)") + field(FLNK, "$(user):aiExample$(no)") field(CALC, "(A