From e27097edb32e349c252debb4cf13309d81ca4b28 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 13 Sep 1999 19:19:43 +0000 Subject: [PATCH] only a single Makeffile for 3.14 --- src/misc/Makefile | 9 +++++++-- src/misc/Makefile.Vx | 12 ------------ 2 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 src/misc/Makefile.Vx diff --git a/src/misc/Makefile b/src/misc/Makefile index 8cca632b9..72f476d2b 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -1,7 +1,12 @@ TOP=../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG + +miscLib_SRCS = epicsRelease.c + +IOC_LIBRARY_vxWorks = miscLib + +include $(TOP)/configure/RULES_BUILD -include $(TOP)/config/RULES_ARCHS diff --git a/src/misc/Makefile.Vx b/src/misc/Makefile.Vx deleted file mode 100644 index f7a2a1766..000000000 --- a/src/misc/Makefile.Vx +++ /dev/null @@ -1,12 +0,0 @@ -TOP = ../../.. -include $(TOP)/config/CONFIG_BASE - -SRCS.c = ../epicsRelease.c - -LIBOBJS = epicsRelease.o - -LIBNAME = miscLib - -include $(TOP)/config/RULES.Vx - -