From 5c084c6ca7d69641a7577cf5700bbf67059e38fe Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 8 May 2000 18:10:20 +0000 Subject: [PATCH] Moved header files and changed Makefiles to get rid of inc build step. --- src/as/Makefile.Host | 4 +--- src/ca/Makefile.Host | 3 --- src/db/Makefile.Host | 4 ---- src/include/Makefile.Host | 10 ++++++++++ src/{as => include}/asDbLib.h | 0 src/{as => include}/asLib.h | 0 src/{ca => include}/cadef.h | 0 src/{ca => include}/caerr.h | 0 src/{ca => include}/caeventmask.h | 0 src/{db => include}/devSup.h | 0 src/{db => include}/drvSup.h | 0 src/{db => include}/drvTS.h | 3 +++ src/{db => include}/fast_lock.h | 0 src/libCom/Makefile.Host | 6 +++--- src/libCom/Makefile.Vx | 6 +++--- 15 files changed, 20 insertions(+), 16 deletions(-) rename src/{as => include}/asDbLib.h (100%) rename src/{as => include}/asLib.h (100%) rename src/{ca => include}/cadef.h (100%) rename src/{ca => include}/caerr.h (100%) rename src/{ca => include}/caeventmask.h (100%) rename src/{db => include}/devSup.h (100%) rename src/{db => include}/drvSup.h (100%) rename src/{db => include}/drvTS.h (99%) rename src/{db => include}/fast_lock.h (100%) diff --git a/src/as/Makefile.Host b/src/as/Makefile.Host index f6eeeacaf..19976c754 100644 --- a/src/as/Makefile.Host +++ b/src/as/Makefile.Host @@ -3,8 +3,6 @@ include $(TOP)/config/CONFIG_BASE USR_CFLAGS += -D_NO_PROTO -INC := asDbLib.h asLib.h - # build lib As from asLib.c: # LIBSRCS := asLib.c @@ -16,7 +14,7 @@ LIBRARY := As # SYS_PROD_LIBS_DEFAULT := m SYS_PROD_LIBS_WIN32 := -nil- -PROD_LIBS := As Com Db Com +PROD_LIBS := As Db Com PROD := ascheck diff --git a/src/ca/Makefile.Host b/src/ca/Makefile.Host index c52369b2f..6a51dbf5a 100644 --- a/src/ca/Makefile.Host +++ b/src/ca/Makefile.Host @@ -7,9 +7,6 @@ CMPLR = STRICT # # includes to install from this subproject # -INC += cadef.h -INC += caerr.h -INC += caeventmask.h INC += caProto.h # diff --git a/src/db/Makefile.Host b/src/db/Makefile.Host index 4a1556c75..f72819236 100644 --- a/src/db/Makefile.Host +++ b/src/db/Makefile.Host @@ -7,8 +7,6 @@ include $(TOP)/config/CONFIG_BASE # includes to install from this sub-project # -INC += drvTS.h -INC += drvSup.h INC += callback.h INC += dbLock.h INC += dbAccess.h @@ -18,10 +16,8 @@ INC += dbScan.h INC += db_access.h INC += dbAddr.h INC += db_field_log.h -INC += fast_lock.h INC += initHooks.h INC += recSup.h -INC += devSup.h INC += taskwd.h INC += recGbl.h INC += dbBkpt.h diff --git a/src/include/Makefile.Host b/src/include/Makefile.Host index 3de77e90e..3b726d988 100644 --- a/src/include/Makefile.Host +++ b/src/include/Makefile.Host @@ -1,6 +1,16 @@ TOP = ../../.. include $(TOP)/config/CONFIG_BASE +INC += drvTS.h +INC += fast_lock.h +INC += devSup.h +INC += drvSup.h +INC += caeventmask.h +INC += asLib.h +INC += cadef.h +INC += caerr.h +INC += asDbLib.h + INC += dbDefs.h INC += camacLib.h INC += epicsTypes.h diff --git a/src/as/asDbLib.h b/src/include/asDbLib.h similarity index 100% rename from src/as/asDbLib.h rename to src/include/asDbLib.h diff --git a/src/as/asLib.h b/src/include/asLib.h similarity index 100% rename from src/as/asLib.h rename to src/include/asLib.h diff --git a/src/ca/cadef.h b/src/include/cadef.h similarity index 100% rename from src/ca/cadef.h rename to src/include/cadef.h diff --git a/src/ca/caerr.h b/src/include/caerr.h similarity index 100% rename from src/ca/caerr.h rename to src/include/caerr.h diff --git a/src/ca/caeventmask.h b/src/include/caeventmask.h similarity index 100% rename from src/ca/caeventmask.h rename to src/include/caeventmask.h diff --git a/src/db/devSup.h b/src/include/devSup.h similarity index 100% rename from src/db/devSup.h rename to src/include/devSup.h diff --git a/src/db/drvSup.h b/src/include/drvSup.h similarity index 100% rename from src/db/drvSup.h rename to src/include/drvSup.h diff --git a/src/db/drvTS.h b/src/include/drvTS.h similarity index 99% rename from src/db/drvTS.h rename to src/include/drvTS.h index 9a5d854af..61ff3e8ed 100644 --- a/src/db/drvTS.h +++ b/src/include/drvTS.h @@ -3,6 +3,9 @@ /* * $Log$ + * Revision 1.3 1998/09/29 14:11:03 mrk + * TSsetClockFromUnix was made global + * * Revision 1.2 1998/03/19 20:41:16 mrk * Checked for Y2K complience. It turns out it was even ok when NTP time overflows * in 2036. However it was modified so that no overflows should occur while convert diff --git a/src/db/fast_lock.h b/src/include/fast_lock.h similarity index 100% rename from src/db/fast_lock.h rename to src/include/fast_lock.h diff --git a/src/libCom/Makefile.Host b/src/libCom/Makefile.Host index c10e4f61a..a452b8505 100644 --- a/src/libCom/Makefile.Host +++ b/src/libCom/Makefile.Host @@ -116,11 +116,11 @@ MAN3 = gpHash.3 freeList.3 # for bldErrSymTbl: # -ERR_S_FILES += $(TOP)/src/as/asLib.h +ERR_S_FILES += $(TOP)/src/include/asLib.h ERR_S_FILES += $(TOP)/src/db/dbAccess.h ERR_S_FILES += $(TOP)/src/db/devLib.h -ERR_S_FILES += $(TOP)/src/db/devSup.h -ERR_S_FILES += $(TOP)/src/db/drvSup.h +ERR_S_FILES += $(TOP)/src/include/devSup.h +ERR_S_FILES += $(TOP)/src/include/drvSup.h ERR_S_FILES += $(TOP)/src/db/recSup.h ERR_S_FILES += $(TOP)/src/dbStatic/dbStaticLib.h ERR_S_FILES += $(TOP)/src/drv/ansi/drvEpvxi.h diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx index 407af6e67..4d5812ce5 100644 --- a/src/libCom/Makefile.Vx +++ b/src/libCom/Makefile.Vx @@ -70,11 +70,11 @@ LIBNAME = libCom MAN3 = gpHash.3 freeList.3 -ERR_S_FILES += $(TOP)/src/as/asLib.h +ERR_S_FILES += $(TOP)/src/include/asLib.h ERR_S_FILES += $(TOP)/src/db/dbAccess.h ERR_S_FILES += $(TOP)/src/db/devLib.h -ERR_S_FILES += $(TOP)/src/db/devSup.h -ERR_S_FILES += $(TOP)/src/db/drvSup.h +ERR_S_FILES += $(TOP)/src/include/devSup.h +ERR_S_FILES += $(TOP)/src/include/drvSup.h ERR_S_FILES += $(TOP)/src/db/recSup.h ERR_S_FILES += $(TOP)/src/dbStatic/dbStaticLib.h ERR_S_FILES += $(TOP)/src/drv/ansi/drvEpvxi.h