From c6aaa181edda59f412f47a644281e9aa90a14ce0 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Tue, 13 May 2003 16:08:40 +0000 Subject: [PATCH] R3.14 changes. --- motorExApp/WithAsyn/Makefile.Host | 12 ------ motorExApp/WithAsyn/Makefile.Vx | 66 ------------------------------- motorExApp/WithMPF/Makefile.Host | 12 ------ motorExApp/WithMPF/Makefile.Vx | 66 ------------------------------- 4 files changed, 156 deletions(-) delete mode 100644 motorExApp/WithAsyn/Makefile.Host delete mode 100644 motorExApp/WithAsyn/Makefile.Vx delete mode 100644 motorExApp/WithMPF/Makefile.Host delete mode 100644 motorExApp/WithMPF/Makefile.Vx diff --git a/motorExApp/WithAsyn/Makefile.Host b/motorExApp/WithAsyn/Makefile.Host deleted file mode 100644 index 191ee244..00000000 --- a/motorExApp/WithAsyn/Makefile.Host +++ /dev/null @@ -1,12 +0,0 @@ -# Makefile.Host -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -DBDEXPAND = WithMPFInclude.dbd -DBDNAME = WithMPFApp.dbd - -include $(TOP)/config/RULES.Host -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/motorExApp/WithAsyn/Makefile.Vx b/motorExApp/WithAsyn/Makefile.Vx deleted file mode 100644 index 2e57e23d..00000000 --- a/motorExApp/WithAsyn/Makefile.Vx +++ /dev/null @@ -1,66 +0,0 @@ -# The WithMPF IOC can be configured either as a MPF client in a two CPU board -# configuration, or as a single CPU board with both MPF client and server on -# the same CPU board. Remove either the "# !MPF-1-CPU! #" or the -# "# !MPF-2-CPU! #" comment to configure. - - -# Makefile.Vx -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -# !!WARNING!! If you copy this file to your -# application, the following line -# MUST BE REMOVED and a MOTOR entry must be -# in your /config/RELEASE file. -MOTOR_BIN = $(TOP)/bin/$(T_A) - -include $(TEMPLATE_TOP)/exampleApp/src/baseLIBOBJS - -LIBOBJS += $(EPICS_BASE_BIN)/iocCore - -LIBOBJS += $(MOTOR_BIN)/motorLib -LIBOBJS += $(MOTOR_BIN)/motorCOM_mpf -LIBOBJS += $(MOTOR_BIN)/ImsLib -LIBOBJS += $(MOTOR_BIN)/newportLib - -# Objects from "mpf" -LIBOBJS += $(MPF_BIN)/mpfLib -LIBOBJS += $(MPF_BIN)/ipLib -LIBOBJS += $(MPF_BIN)/DevMpf.o - -LIBOBJS += $(MPF_SERIAL_BIN)/OctalUART.o -LIBOBJS += $(MPF_SERIAL_BIN)/SerialPort.o -LIBOBJS += $(MPF_SERIAL_BIN)/serialServer.o - -LIBOBJS += $(MPF_GPIB_BIN)/GpibGsTi9914.o -LIBOBJS += $(MPF_GPIB_BIN)/Gpib.o -LIBOBJS += $(MPF_GPIB_BIN)/gpibServer.o - -# The motor communication library (i.e. motorCOM_mpf) -# requires both serial and GPIB support. Some motion -# controllers (e.g., Newport) can be configured from -# the st.cmd file for either serial or GPIB -# communication; hence, the reason for supporting both -# at run time. - -LIBOBJS += $(EPICS_BASE_BIN)/drvGpib.o -# Up to and including EPICS base R3.13.3, drvGpib.o -# requires drvBitBus.o below. -LIBOBJS += $(EPICS_BASE_BIN)/drvBitBus.o - -LIBNAME = WithMPFLib - -# Both "Local" and "Remote" versions of GpibHideos are -# copied to the bin directory. Which one is loaded is -# specified in the st.cmd file. -BIN_INSTALLS = $(MPF_GPIB_BIN)/GpibHideosLocal.o -BIN_INSTALLS += $(MPF_GPIB_BIN)/GpibHideosRemote.o - -#Note that the command line that builds the -#library $(LIBNAME) may be HUGE (>3kB) -# -include $(TOP)/config/RULES.Vx -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/motorExApp/WithMPF/Makefile.Host b/motorExApp/WithMPF/Makefile.Host deleted file mode 100644 index 191ee244..00000000 --- a/motorExApp/WithMPF/Makefile.Host +++ /dev/null @@ -1,12 +0,0 @@ -# Makefile.Host -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -DBDEXPAND = WithMPFInclude.dbd -DBDNAME = WithMPFApp.dbd - -include $(TOP)/config/RULES.Host -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/motorExApp/WithMPF/Makefile.Vx b/motorExApp/WithMPF/Makefile.Vx deleted file mode 100644 index 2e57e23d..00000000 --- a/motorExApp/WithMPF/Makefile.Vx +++ /dev/null @@ -1,66 +0,0 @@ -# The WithMPF IOC can be configured either as a MPF client in a two CPU board -# configuration, or as a single CPU board with both MPF client and server on -# the same CPU board. Remove either the "# !MPF-1-CPU! #" or the -# "# !MPF-2-CPU! #" comment to configure. - - -# Makefile.Vx -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -# !!WARNING!! If you copy this file to your -# application, the following line -# MUST BE REMOVED and a MOTOR entry must be -# in your /config/RELEASE file. -MOTOR_BIN = $(TOP)/bin/$(T_A) - -include $(TEMPLATE_TOP)/exampleApp/src/baseLIBOBJS - -LIBOBJS += $(EPICS_BASE_BIN)/iocCore - -LIBOBJS += $(MOTOR_BIN)/motorLib -LIBOBJS += $(MOTOR_BIN)/motorCOM_mpf -LIBOBJS += $(MOTOR_BIN)/ImsLib -LIBOBJS += $(MOTOR_BIN)/newportLib - -# Objects from "mpf" -LIBOBJS += $(MPF_BIN)/mpfLib -LIBOBJS += $(MPF_BIN)/ipLib -LIBOBJS += $(MPF_BIN)/DevMpf.o - -LIBOBJS += $(MPF_SERIAL_BIN)/OctalUART.o -LIBOBJS += $(MPF_SERIAL_BIN)/SerialPort.o -LIBOBJS += $(MPF_SERIAL_BIN)/serialServer.o - -LIBOBJS += $(MPF_GPIB_BIN)/GpibGsTi9914.o -LIBOBJS += $(MPF_GPIB_BIN)/Gpib.o -LIBOBJS += $(MPF_GPIB_BIN)/gpibServer.o - -# The motor communication library (i.e. motorCOM_mpf) -# requires both serial and GPIB support. Some motion -# controllers (e.g., Newport) can be configured from -# the st.cmd file for either serial or GPIB -# communication; hence, the reason for supporting both -# at run time. - -LIBOBJS += $(EPICS_BASE_BIN)/drvGpib.o -# Up to and including EPICS base R3.13.3, drvGpib.o -# requires drvBitBus.o below. -LIBOBJS += $(EPICS_BASE_BIN)/drvBitBus.o - -LIBNAME = WithMPFLib - -# Both "Local" and "Remote" versions of GpibHideos are -# copied to the bin directory. Which one is loaded is -# specified in the st.cmd file. -BIN_INSTALLS = $(MPF_GPIB_BIN)/GpibHideosLocal.o -BIN_INSTALLS += $(MPF_GPIB_BIN)/GpibHideosRemote.o - -#Note that the command line that builds the -#library $(LIBNAME) may be HUGE (>3kB) -# -include $(TOP)/config/RULES.Vx -#---------------------------------------- -# ADD RULES AFTER THIS LINE