Merge branch 'fixups/move_initHooks' into 7.0

2018-10-20 21:38:04 -05:00
parent 6f29a00ead dc310a4238
commit 5f68d62f40
4 changed files with 3 additions and 3 deletions
@@ -35,7 +35,6 @@ INC += dbTest.h
 INC += dbCaTest.h
 INC += db_test.h
 INC += db_field_log.h
-INC += initHooks.h
 INC += recGbl.h
 INC += dbIocRegister.h
 INC += chfPlugin.h
@@ -86,7 +85,6 @@ dbCore_SRCS += recGbl.c
 dbCore_SRCS += callback.c
 dbCore_SRCS += dbCa.c
 dbCore_SRCS += dbCaTest.c
-dbCore_SRCS += initHooks.c
 dbCore_SRCS += cvtBpt.c
 dbCore_SRCS += dbContext.cpp
 dbCore_SRCS += dbChannelIO.cpp
@@ -9,8 +9,10 @@

 SRC_DIRS += $(LIBCOM)/iocsh
 INC += iocsh.h
+INC += initHooks.h
 INC += registry.h
 INC += libComRegister.h
 Com_SRCS += iocsh.cpp
+Com_SRCS += initHooks.c
 Com_SRCS += registry.c
 Com_SRCS += libComRegister.c
@@ -16,12 +16,12 @@
 #include <stddef.h>
 #include <stdio.h>

+#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "epicsMutex.h"
 #include "epicsThread.h"

-#define epicsExportSharedSymbols
 #include "initHooks.h"

 typedef struct initHookLink {