diff --git a/src/sequencer/Makefile b/src/sequencer/Makefile index 8cca632b9..31cae084e 100644 --- a/src/sequencer/Makefile +++ b/src/sequencer/Makefile @@ -1,7 +1,50 @@ TOP=../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +#YACCOPT = -l +#LEXOPT = -L +#USR_LDLIBS = -ll +YACCOPT = -d -v + +SYS_PROD_LIBS_DEFAULT := m +SYS_PROD_LIBS_WIN32 := -nil- + +INC += seq.h +INC += seqCom.h + +SRCS += snc_main.c +SRCS += parse.c +SRCS += phase2.c +SRCS += gen_ss_code.c +SRCS += gen_tables.c +SRCS += sncVersion.c +SRCS += snc.c + +PROD += snc + +seq_CFLAGS = + +seq_SRCS = \ + seq_main.c seq_ca.c seq_qry.c seq_task.c \ + seq_mac.c seq_prog.c seq_if.c seqVersion.c + +IOC_LIBRARY_vxWorks = seq + +include $(TOP)/configure/RULES_BUILD + +# +# The generated lex file includes snc.h +# +snc.c: snc_lex.c + +sncVersion.c: ../Version ../makeVersion.pl + $(PERL) ../makeVersion.pl ../Version sncVersion + +clean:: + @$(RM) y.output sncVersion.c snc_lex.c snc.c snc.h + +seqVersion.c: ../Version ../makeVersion.pl + $(PERL) ../makeVersion.pl ../Version seqVersion diff --git a/src/sequencer/Makefile.Host b/src/sequencer/Makefile.Host deleted file mode 100644 index b0e2b039c..000000000 --- a/src/sequencer/Makefile.Host +++ /dev/null @@ -1,38 +0,0 @@ -TOP = ../../.. -include $(TOP)/config/CONFIG_BASE - -#YACCOPT = -l -#LEXOPT = -L - -#USR_LDLIBS = -ll -YACCOPT = -d -v - -SYS_PROD_LIBS_DEFAULT := m -SYS_PROD_LIBS_WIN32 := -nil- - -INC += seq.h -INC += seqCom.h - -SRCS += snc_main.c -SRCS += parse.c -SRCS += phase2.c -SRCS += gen_ss_code.c -SRCS += gen_tables.c -SRCS += sncVersion.c -SRCS += snc.c - -PROD += snc - -include $(TOP)/config/RULES.Host - -# -# The generated lex file includes snc.h -# -snc.c: snc_lex.c - -sncVersion.c: ../Version ../makeVersion.pl - $(PERL) ../makeVersion.pl ../Version sncVersion - -clean:: - @$(RM) y.output sncVersion.c snc_lex.c snc.c snc.h - diff --git a/src/sequencer/Makefile.Vx b/src/sequencer/Makefile.Vx deleted file mode 100644 index d3ada5438..000000000 --- a/src/sequencer/Makefile.Vx +++ /dev/null @@ -1,26 +0,0 @@ -TOP = ../../.. -include $(TOP)/config/CONFIG_BASE - -USR_CFLAGS = - -SRCS.c = \ - ../seq_main.c ../seq_ca.c ../seq_qry.c ../seq_task.c \ - ../seq_mac.c ../seq_prog.c ../seq_if.c - -OBJS = \ - seq_main.o seq_ca.o seq_qry.o seq_task.o \ - seq_mac.o seq_prog.o seq_if.o seqVersion.o - -PROD = seq - -include $(TOP)/config/RULES.Vx - -clean:: - @$(RM) seqVersion.c - -$(PROD): $(OBJS) - $(RM) $@ - $(LINK.c) $@ $(OBJS) $(LDLIBS) - -seqVersion.c: ../Version ../makeVersion.pl - $(PERL) ../makeVersion.pl ../Version seqVersion diff --git a/src/tools/Makefile b/src/tools/Makefile index 8cca632b9..1c8483cb0 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -1,7 +1,14 @@ TOP=../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +# install these scripts: +# +SCRIPTS += $(subst ../,,$(wildcard ../*.pl)) +SCRIPTS += installEpics + +include $(TOP)/configure/RULES_BUILD + +# EOF base/src/tools/Makefile.Host diff --git a/src/tools/Makefile.Host b/src/tools/Makefile.Host deleted file mode 100644 index 692ce4316..000000000 --- a/src/tools/Makefile.Host +++ /dev/null @@ -1,15 +0,0 @@ -# base/src/tools/Makefile.Host -# - -TOP = ../../.. -include $(TOP)/config/CONFIG_BASE - -# install these scripts: -# - -SCRIPTS += $(subst ../,,$(wildcard ../*.pl)) -SCRIPTS += installEpics - -include $(TOP)/config/RULES.Host - -# EOF base/src/tools/Makefile.Host diff --git a/src/toolsComm/Makefile b/src/toolsComm/Makefile index aee6255a6..3abe94858 100644 --- a/src/toolsComm/Makefile +++ b/src/toolsComm/Makefile @@ -1,9 +1,9 @@ TOP=../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG DIRS = antelope flex -include $(TOP)/config/RULES_DIRS +include $(TOP)/configure/RULES_DIRS diff --git a/src/toolsComm/antelope/Makefile b/src/toolsComm/antelope/Makefile index 784cf01d0..a27bafa5f 100644 --- a/src/toolsComm/antelope/Makefile +++ b/src/toolsComm/antelope/Makefile @@ -1,7 +1,16 @@ TOP=../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +HOST_WARN=NO +USR_CFLAGS = -D_NO_PROTO + +SRCS= closure.c error.c lalr.c lr0.c main.c \ + mkpar.c output.c reader.c skeleton.c \ + symtab.c verbose.c warshall.c + +PROD=antelope + +include $(TOP)/configure/RULES_BUILD diff --git a/src/toolsComm/antelope/Makefile.Host b/src/toolsComm/antelope/Makefile.Host deleted file mode 100644 index 96bb8d4aa..000000000 --- a/src/toolsComm/antelope/Makefile.Host +++ /dev/null @@ -1,20 +0,0 @@ -# Makefile.Host for base/src/toolsComm/antelope -# -# - -TOP = ../../../.. -include $(TOP)/config/CONFIG_BASE - -HOST_WARN=NO - -USR_CFLAGS = -D_NO_PROTO - -SRCS= closure.c error.c lalr.c lr0.c main.c \ - mkpar.c output.c reader.c skeleton.c \ - symtab.c verbose.c warshall.c - -PROD=antelope - -include $(TOP)/config/RULES.Host - -# EOF Makefile.Host diff --git a/src/toolsComm/flex/Makefile b/src/toolsComm/flex/Makefile index 784cf01d0..6e0bbedb4 100644 --- a/src/toolsComm/flex/Makefile +++ b/src/toolsComm/flex/Makefile @@ -1,7 +1,36 @@ TOP=../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +HOST_WARN=NO + +YACC = $(EYACC) +YACCOPT = -l -d +SKELETON_FILE=include/flex.skel.static + +# ARCH_CLASS hp700 needs special flags, +# everything else uses default: +# +USR_CFLAGS_DEFAULT := -DUSG +USR_CFLAGS_hp700 := -DSCO_UNIX + +# This applies to all arch.classes: +# +USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\" + +INC += flex.skel.static + +# main.c is included in parse.c +# +SRCS := ccl.c dfa.c ecs.c gen.c misc.c nfa.c sym.c tblcmp.c parse.c + +PROD := e_flex + +include $(TOP)/configure/RULES_BUILD + +clean:: + $(RM) parse.c parse.h + +# EOF Makefile.Host for base/src/toolsComm/flex diff --git a/src/toolsComm/flex/Makefile.Host b/src/toolsComm/flex/Makefile.Host deleted file mode 100644 index 94ff1d536..000000000 --- a/src/toolsComm/flex/Makefile.Host +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile.Host for base/src/toolsComm/flex -# -# - -TOP = ../../../.. -include $(TOP)/config/CONFIG_BASE - -HOST_WARN=NO - -YACC = $(EYACC) -YACCOPT = -l -d - -SKELETON_FILE=include/flex.skel.static - -# ARCH_CLASS hp700 needs special flags, -# everything else uses default: -# -USR_CFLAGS_DEFAULT := -DUSG -USR_CFLAGS_hp700 := -DSCO_UNIX - -# This applies to all arch.classes: -# -USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\" - -INC += flex.skel.static - -# main.c is included in parse.c -# -SRCS := ccl.c dfa.c ecs.c gen.c misc.c nfa.c sym.c tblcmp.c parse.c - -PROD := e_flex - -include $(TOP)/config/RULES.Host - -clean:: - $(RM) parse.c parse.h - -# EOF Makefile.Host for base/src/toolsComm/flex diff --git a/src/util/Makefile b/src/util/Makefile index 8cca632b9..6da562ca7 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -1,7 +1,30 @@ TOP=../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +CMPLR = STRICT + +# default Unix needs lib m, every system needs libs ca & Com: +SYS_PROD_LIBS_DEFAULT := m +SYS_PROD_LIBS_WIN32 := -nil- +PROD_LIBS := ca Com Osi +# +# Added winmm user32 for the non-dll build +# +SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 +PROD_DEFAULT := ca_test iocLogServer startCArepeater +PROD_WIN32 := ca_test iocLogServer +PROD_vxWorks = ca_test.o + +SCRIPTS_solaris := S99logServer S99caRepeater + +include $(TOP)/configure/RULES_BUILD + +S99%: ../rc2.% + @/usr/bin/sed -e s%:EPICS:%`chdir $(TOP); /usr/bin/pwd`% \ + -e s%:INSTALL_BIN:%`chdir $(INSTALL_BIN); /usr/bin/pwd`% \ + $< >$@ + +# EOF Makefile.Host for base/src/util diff --git a/src/util/Makefile.Host b/src/util/Makefile.Host deleted file mode 100644 index 159699d09..000000000 --- a/src/util/Makefile.Host +++ /dev/null @@ -1,31 +0,0 @@ -# Makefile.Host for base/src/util -# - -TOP = ../../.. -include $(TOP)/config/CONFIG_BASE - -CMPLR = STRICT - -# default Unix needs lib m, every system needs libs ca & Com: -SYS_PROD_LIBS_DEFAULT := m -SYS_PROD_LIBS_WIN32 := -nil- -PROD_LIBS := ca Com -# -# Added winmm user32 for the non-dll build -# -SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 -PROD_DEFAULT := ca_test iocLogServer startCArepeater -PROD_WIN32 := ca_test iocLogServer - -ifeq ($(T_A),solaris) -SCRIPTS := S99logServer S99caRepeater -endif - -include $(TOP)/config/RULES.Host - -S99%: ../rc2.% - @/usr/bin/sed -e s%:EPICS:%`chdir $(TOP); /usr/bin/pwd`% \ - -e s%:INSTALL_BIN:%`chdir $(INSTALL_BIN); /usr/bin/pwd`% \ - $< >$@ - -# EOF Makefile.Host for base/src/util diff --git a/src/util/Makefile.Vx b/src/util/Makefile.Vx deleted file mode 100644 index 1bbc02d63..000000000 --- a/src/util/Makefile.Vx +++ /dev/null @@ -1,9 +0,0 @@ -TOP = ../../.. -include $(TOP)/config/CONFIG_BASE - -SRCS.c = ../ca_test.c - -TARGETS = ca_test.o - -include $(TOP)/config/RULES.Vx - diff --git a/src/util/ca_test.c b/src/util/ca_test.c index b2fe13896..918531182 100644 --- a/src/util/ca_test.c +++ b/src/util/ca_test.c @@ -43,10 +43,6 @@ #include #include -#ifdef vxWorks -#include -#endif - #ifndef ERROR #define ERROR -1 #endif