From 75e91102b3280d862954f716159950f1255142c8 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 18 Nov 1999 13:59:40 +0000 Subject: [PATCH] new way to build --- src/as/Makefile | 37 +-------------------------------- src/as/Makefile.Host | 30 ++++++++++++++++++++++++++ src/as/Makefile.Ioc | 21 +++++++++++++++++++ src/vxWorks/iocCore/Makefile | 19 +---------------- src/vxWorks/libvxWorks/Makefile | 10 +-------- 5 files changed, 54 insertions(+), 63 deletions(-) create mode 100644 src/as/Makefile.Host create mode 100644 src/as/Makefile.Ioc diff --git a/src/as/Makefile b/src/as/Makefile index 9fb9edd20..d56852bad 100644 --- a/src/as/Makefile +++ b/src/as/Makefile @@ -3,39 +3,4 @@ TOP=../.. include $(TOP)/configure/CONFIG -USR_CFLAGS += -D_NO_PROTO - -#INC += asDbLib.h moved header to src/include -#INC += asLib.h moved header to src/include - -# build lib As from asLib.c: -# -LIBRARY_DEFAULT := As -As_SRCS := asLib.c - -# All systems link the libs As, Com, Db (and again Com ??), -# generic Unix needs also lib m: -# -SYS_PROD_LIBS_DEFAULT := m -SYS_PROD_LIBS_WIN32 := -nil- -PROD_LIBS := As Com Db Com - -PROD_DEFAULT := ascheck -PROD_vxWorks = -nil- - -LIBRARY_vxWorks = asLibrary - -asLibrary_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO - -asLibrary_SRCS = asDbLib.c asCa.c asLib.c - -include $(TOP)/configure/RULES_BUILD - -# Extra rule since asLib_lex.c is included in asLib.c -# In my opinion, these objects should really be built -# independently. -asLib$(OBJ): asLib_lex.c ../asLibRoutines.c - -clean:: - @$(RM) asLib.c asLib_lex.c - +include $(TOP)/configure/RULES_ARCHS diff --git a/src/as/Makefile.Host b/src/as/Makefile.Host new file mode 100644 index 000000000..aac768da9 --- /dev/null +++ b/src/as/Makefile.Host @@ -0,0 +1,30 @@ + +TOP=../.. +include $(TOP)/configure/CONFIG + +USR_CFLAGS += -D_NO_PROTO + +# build lib As from asLib.c: +# +LIBRARY := As +As_SRCS := asLib.c + +# All systems link the libs As, Com, Db (and again Com ??), +# generic Unix needs also lib m: +# +SYS_PROD_LIBS_DEFAULT := m +SYS_PROD_LIBS_WIN32 := -nil- +PROD_LIBS := As Com Db Com + +PROD = ascheck + +include $(TOP)/configure/RULES_BUILD + +# Extra rule since asLib_lex.c is included in asLib.c +# In my opinion, these objects should really be built +# independently. +asLib$(OBJ): asLib_lex.c ../asLibRoutines.c + +clean:: + @$(RM) asLib.c asLib_lex.c + diff --git a/src/as/Makefile.Ioc b/src/as/Makefile.Ioc new file mode 100644 index 000000000..44e03eab7 --- /dev/null +++ b/src/as/Makefile.Ioc @@ -0,0 +1,21 @@ + +TOP=../.. + +include $(TOP)/configure/CONFIG + +USR_CFLAGS += -DACCESS_SECURITY -D_NO_PROTO + +LIBRARY = asLibrary + +asLibrary_SRCS = asDbLib.c asCa.c asLib.c + +include $(TOP)/configure/RULES_BUILD + +# Extra rule since asLib_lex.c is included in asLib.c +# In my opinion, these objects should really be built +# independently. +asLib$(OBJ): asLib_lex.c ../asLibRoutines.c + +clean:: + @$(RM) asLib.c asLib_lex.c + diff --git a/src/vxWorks/iocCore/Makefile b/src/vxWorks/iocCore/Makefile index 88e4094a0..3ee384dbb 100644 --- a/src/vxWorks/iocCore/Makefile +++ b/src/vxWorks/iocCore/Makefile @@ -3,21 +3,4 @@ TOP=../../.. include $(TOP)/configure/CONFIG -LIBRARY_vxWorks = iocCore - -LIBOBJS = \ - $(INSTALL_BIN)/asLibrary \ - $(INSTALL_BIN)/caLib \ - $(INSTALL_BIN)/dbLib \ - $(INSTALL_BIN)/libCom \ - $(INSTALL_BIN)/dbStaticLib \ - $(INSTALL_BIN)/miscLib \ - $(INSTALL_BIN)/bptLibrary \ - $(INSTALL_BIN)/registryLibrary \ - $(INSTALL_BIN)/rsrvLib \ - $(INSTALL_BIN)/vxComLib \ - $(INSTALL_BIN)/vxDbLib - -include $(TOP)/configure/RULES_BUILD - -iocCore: $(LIBOBJS) +include $(TOP)/configure/RULES_ARCHS diff --git a/src/vxWorks/libvxWorks/Makefile b/src/vxWorks/libvxWorks/Makefile index 02ef97df0..8984d6975 100644 --- a/src/vxWorks/libvxWorks/Makefile +++ b/src/vxWorks/libvxWorks/Makefile @@ -3,14 +3,6 @@ TOP=../../.. include $(TOP)/configure/CONFIG -INC += epicsDynLink.h - -vxComLib_SRCS += iocLogClient.c -vxComLib_SRCS += veclist.c -vxComLib_SRCS += epicsDynLink.c - -LIBRARY_vxWorks = vxComLib - -include $(TOP)/configure/RULES_BUILD +include $(TOP)/configure/RULES_ARCHS