From 0d43a37b857efca903187b2e791b3c2066c03296 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Fri, 9 Jul 1999 13:53:29 +0000 Subject: [PATCH] encorporate latest changes on 09JUL99 --- config/CONFIG_COMMON | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON index eb37e726a..9ca50615e 100644 --- a/config/CONFIG_COMMON +++ b/config/CONFIG_COMMON @@ -30,6 +30,7 @@ INSTALL_MAN = $(INSTALL_LOCATION)/man INSTALL_TEMPLATES = $(INSTALL_LOCATION)/templates INSTALL_DBD = $(INSTALL_LOCATION)/dbd INSTALL_CONFIG = $(INSTALL_LOCATION)/config +INSTALL_JAVA = $(INSTALL_LOCATION)/javalib EPICS_BASE_INCLUDE = $(EPICS_BASE)/include @@ -53,6 +54,7 @@ PERL=perl # install from EPICS INSTALL = $(PERL) $(EPICS_BASE_HOST_BIN)/installEpics.pl INSTALL_PRODUCT = $(INSTALL) +INSTALL_LIBRARY = $(INSTALL) # dbtools from EPICS @@ -109,6 +111,11 @@ G++_SHRLIB_LDFLAGS_YES = -shared CC = $($(ANSI)_$(CMPLR)) +#--------------------------------------------------------------- +# Vendor compiler dependent options +VENDOR_DEP_CFLAGS = $($(ANSI)_DEP_CFLAGS) +VENDOR_DEP_CXXFLAGS = $($(CPLUSPLUS)_DEP_CFLAGS) + #-------------------------------------------------- # C++ compiler @@ -195,13 +202,14 @@ DEPENDS_RULE = -$(COMPILE.cc) $(DEPENDS_FLAG) $^ > DEPENDS # Include files -INCLUDES = -I. -I.. $(USR_INCLUDES) $(TARGET_INCLUDES) $(EPICS_INCLUDES) $(OP_SYS_INCLUDES) +INCLUDES = -I. -I.. $(EPICS_INCLUDES) $(USR_INCLUDES) $(TARGET_INCLUDES) $(OP_SYS_INCLUDES) CFLAGS = $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\ - $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(INCLUDES) + $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VENDOR_DEP_CFLAGS) $(STATIC_CFLAGS)\ + $(OP_SYS_CFLAGS) $(INCLUDES) CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\ - $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(STATIC_CXXCFLAGS)\ + $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(VENDOR_DEP_CXXFLAGS) $(STATIC_CXXCFLAGS)\ $(OP_SYS_CFLAGS) $(TEMPL_INST_CXXFLAG) $(INCLUDES) LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\ @@ -210,7 +218,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\ LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\ $(STATIC_LDLIBS) $(OP_SYS_LDLIBS) -CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) +CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) CPPSNCFLAGS = $(INCLUDES)