From dc310a42385564d1c1e6509ddcf5448b3d973540 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 27 Jun 2018 18:00:14 -0700
Subject: [PATCH] move initHooks to libCom

---
 modules/database/src/ioc/db/Makefile                          | 2 --
 modules/libcom/src/iocsh/Makefile                             | 2 ++
 modules/{database/src/ioc/db => libcom/src/iocsh}/initHooks.c | 2 +-
 modules/{database/src/ioc/db => libcom/src/iocsh}/initHooks.h | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/{database/src/ioc/db => libcom/src/iocsh}/initHooks.c (100%)
 rename modules/{database/src/ioc/db => libcom/src/iocsh}/initHooks.h (100%)

diff --git a/modules/database/src/ioc/db/Makefile b/modules/database/src/ioc/db/Makefile
index d28119ff7..c6f33556a 100644
--- a/modules/database/src/ioc/db/Makefile
+++ b/modules/database/src/ioc/db/Makefile
@@ -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
diff --git a/modules/libcom/src/iocsh/Makefile b/modules/libcom/src/iocsh/Makefile
index 766577354..274b02b48 100644
--- a/modules/libcom/src/iocsh/Makefile
+++ b/modules/libcom/src/iocsh/Makefile
@@ -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
diff --git a/modules/database/src/ioc/db/initHooks.c b/modules/libcom/src/iocsh/initHooks.c
similarity index 100%
rename from modules/database/src/ioc/db/initHooks.c
rename to modules/libcom/src/iocsh/initHooks.c
index 9070c53f5..0884bdd0a 100644
--- a/modules/database/src/ioc/db/initHooks.c
+++ b/modules/libcom/src/iocsh/initHooks.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 {
diff --git a/modules/database/src/ioc/db/initHooks.h b/modules/libcom/src/iocsh/initHooks.h
similarity index 100%
rename from modules/database/src/ioc/db/initHooks.h
rename to modules/libcom/src/iocsh/initHooks.h