From 7340d25c66cf04c2753cd668aaacf0c14825b40f Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Tue, 18 Apr 2000 20:42:42 +0000 Subject: [PATCH] Moved Hideos and MPF code to CommSrc directory. --- motorApp/MotorSrc/Makefile.Host | 1 - motorApp/MotorSrc/Makefile.Vx | 26 +++----------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/motorApp/MotorSrc/Makefile.Host b/motorApp/MotorSrc/Makefile.Host index e693b989..b1831c5f 100644 --- a/motorApp/MotorSrc/Makefile.Host +++ b/motorApp/MotorSrc/Makefile.Host @@ -8,7 +8,6 @@ RECTYPES += motorRecord.h INC += motor.h motordevCom.h motordrvCom.h INC += motordrvComCode.h -INC += gpibIO.h serialIO.h include $(TOP)/config/RULES.Host #---------------------------------------- diff --git a/motorApp/MotorSrc/Makefile.Vx b/motorApp/MotorSrc/Makefile.Vx index 7143cbae..221000d4 100644 --- a/motorApp/MotorSrc/Makefile.Vx +++ b/motorApp/MotorSrc/Makefile.Vx @@ -4,31 +4,11 @@ include $(TOP)/config/CONFIG_APP #---------------------------------------- # ADD MACRO DEFINITIONS AFTER THIS LINE -# The following is required for device drivers that require serial -# or GPIB communication support via HIDEOS. In addition, the -# HIDEOS directory must be defined in the config/RELEASE file. -USR_CXXFLAGS += -DOS_EQ_VXWORKS -SRCS.c += ../gpibIO.c -SRCS.cc += ../serialIO.cc -HIDEOSLIBOBJS = gpibIO.o serialIO.o - -# The following is required for device drivers that require serial -# or GPIB communication support via MPF. In addition, the -# MPF directory must be defined in the config/RELEASE file. -MPFLIBOBJS = serialIOMPF.o -SRCS.cc += ../serialIOMPF.cc - -# The following is required for all motor record configurations. +# The following are required for all motor record configurations. SRCS.c += ../motorRecord.c ../motordevCom.c ../motordrvCom.c -MOTORLIBOBJS = motorRecord.o motordevCom.o motordrvCom.o +LIBOBJS = motorRecord.o motordevCom.o motordrvCom.o -motorLib_hideos: $(MOTORLIBOBJS) $(HIDEOSLIBOBJS) - $(LINK.c) $@ $(MOTORLIBOBJS) $(HIDEOSLIBOBJS) - -motorLib_mpf: $(MOTORLIBOBJS) $(MPFLIBOBJS) - $(LINK.c) $@ $(MOTORLIBOBJS) $(MPFLIBOBJS) - -INSTALLS += motorLib_hideos motorLib_mpf +LIBNAME = motorLib #Note that the command line that builds the #library $(LIBNAME) may be HUGE (>3kB)