From e8ae54e916e8c007d5a69930ae5f030d74aaa5bc Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 10 Feb 2000 19:06:32 +0000 Subject: [PATCH] build changes --- src/db/Makefile | 2 +- src/db/test/Makefile | 6 ++++++ src/db/test/callbackTestMain.c | 25 +++++++++++++++++++++++++ src/dbStatic/Makefile | 10 +++++----- 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/db/test/callbackTestMain.c diff --git a/src/db/Makefile b/src/db/Makefile index 45846535c..26ce3c4bb 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -42,7 +42,6 @@ SRCS += dbBkpt.c SRCS += dbConvert.c SRCS += dbFastLinkConv.c SRCS += dbNotify.c -SRCS += iocInit.c SRCS += dbScan.c SRCS += dbEvent.c SRCS += dbTest.c @@ -55,6 +54,7 @@ SRCS += dbCa.c SRCS += initHooks.c SRCS += dbcar.c +OBJS_IOC += iocInit LIBRARY_IOC = db DLL_LIBS = dbStaticIoc Com diff --git a/src/db/test/Makefile b/src/db/test/Makefile index 0e8b9388b..35d78455f 100644 --- a/src/db/test/Makefile +++ b/src/db/test/Makefile @@ -2,7 +2,13 @@ TOP=../../.. include $(TOP)/configure/CONFIG +PROD_LIBS += db dbStaticHost Com +#PROD_LIBS += db ca dbStaticHost Com + +callbackTestHost_SRCS += callbackTestMain.c callbackTest.c +PROD += callbackTestHost OBJS_IOC += callbackTest + include $(TOP)/configure/RULES diff --git a/src/db/test/callbackTestMain.c b/src/db/test/callbackTestMain.c new file mode 100644 index 000000000..f77fd1ea9 --- /dev/null +++ b/src/db/test/callbackTestMain.c @@ -0,0 +1,25 @@ +/* callbackTestMain.c */ +/* Author: Marty Kraimer Date: 26JAN2000 */ + +/********************COPYRIGHT NOTIFICATION********************************** +This software was developed under a United States Government license +described on the COPYRIGHT_UniversityOfChicago file included as part +of this distribution. +****************************************************************************/ + +#include +#include +#include +#include +#include + +void *pdbbase=NULL; + +void callbackTest(void); + +int main(int argc,char *argv[]) +{ + callbackTest(); + printf("main terminating\n"); + return(0); +} diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile index 76d9e1437..1e74e427f 100644 --- a/src/dbStatic/Makefile +++ b/src/dbStatic/Makefile @@ -18,14 +18,14 @@ INC += guigroup.h LIBSRCS += dbStaticLib.c LIBSRCS += dbYacc.c LIBSRCS += dbPvdLib.c -Db_SRCS += dbStaticNoRun.c -dbStatic_SRCS += dbStaticRun.c +dbStaticHost_SRCS += dbStaticNoRun.c +dbStaticIoc_SRCS += dbStaticRun.c # Library to build: # -LIBRARY_HOST += Db -LIBRARY_IOC += dbStatic +LIBRARY_HOST += dbStaticHost +LIBRARY_IOC += dbStaticIoc DLL_LIBS = Com @@ -35,7 +35,7 @@ PROD = dbReadTest dbExpand dbToMenuH dbToRecordtypeH # libs needed by PROD: # -PROD_LIBS := Db Com +PROD_LIBS := dbStaticHost Com Db_DIR=. include $(TOP)/configure/RULES