From a640ae2ce633c462889a40fee0ae6e41e35ebe04 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 13 Sep 1999 13:32:59 +0000 Subject: [PATCH] changes for 3.14; actually config is no longer used --- config/CONFIG_BASE | 9 ++++----- config/CONFIG_COMMON | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/CONFIG_BASE b/config/CONFIG_BASE index de966eb01..c3b6a321a 100644 --- a/config/CONFIG_BASE +++ b/config/CONFIG_BASE @@ -13,11 +13,11 @@ DIRS += include DIRS += cxxTemplates DIRS += toolsComm DIRS += makeBaseApp +DIRS += osi DIRS += libCom -DIRS += libvxWorks -DIRS += cvtDctsdr DIRS += dbStatic DIRS += db +DIRS += registry DIRS += bpt DIRS += ca DIRS += util @@ -27,10 +27,9 @@ DIRS += dbtools DIRS += rsrv DIRS += rec DIRS += as -DIRS += drv DIRS += dev -DIRS += devOpt -DIRS += iocCore +#FOR NOW JUST BUILD vxWorks dependent stuff +DIRS += vxWorks # # if CPLUSPLUS isnt empty then include C++ src codes diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON index a6baeaef1..6d973e2b7 100644 --- a/config/CONFIG_COMMON +++ b/config/CONFIG_COMMON @@ -212,7 +212,7 @@ DEPENDS_RULE = -$(COMPILE.cc) $(DEPENDS_FLAG) $^ > DEPENDS # Include files -INCLUDES = -I. -I.. $(EPICS_INCLUDES) $(USR_INCLUDES) $(TARGET_INCLUDES) $(OP_SYS_INCLUDES) +INCLUDES = $(USR_INCLUDES) -I. -I.. $(EPICS_INCLUDES) $(TARGET_INCLUDES) $(OP_SYS_INCLUDES) CFLAGS = $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\ $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VENDOR_DEP_CFLAGS) $(STATIC_CFLAGS)\