From 8afabaf4e1849942e104a791a21b3dcea8523503 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 16 Jan 1997 22:16:45 +0000 Subject: [PATCH] MOved position of USR_INCLUDES on compile line. --- config/CONFIG.Linux | 7 ++++--- config/CONFIG.Vx.68k | 6 +++--- config/CONFIG.Vx.pc486 | 6 +++--- config/CONFIG.WIN32 | 6 +++--- config/CONFIG.alpha | 9 +++++---- config/CONFIG.hp700 | 9 +++++---- config/CONFIG.sgi | 7 ++++--- config/CONFIG.solaris | 7 ++++--- config/CONFIG.sun4 | 7 ++++--- 9 files changed, 35 insertions(+), 29 deletions(-) diff --git a/config/CONFIG.Linux b/config/CONFIG.Linux index c52698cb0..d2cffaa7a 100644 --- a/config/CONFIG.Linux +++ b/config/CONFIG.Linux @@ -84,7 +84,8 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(T_A) +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ + -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags OP_SYS_FLAGS = -DUNIX @@ -95,7 +96,7 @@ UNIX_LDLIBS = -lm ARCH_DEP_CFLAGS = -D_X86_ -Dlinux ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS) -UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) +UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) UNIX_CXXFLAGS = $(UNIX_CFLAGS) @@ -121,4 +122,4 @@ LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS -DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.Linux +DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Linux diff --git a/config/CONFIG.Vx.68k b/config/CONFIG.Vx.68k index 00d6df739..6d84c6063 100644 --- a/config/CONFIG.Vx.68k +++ b/config/CONFIG.Vx.68k @@ -29,7 +29,7 @@ VX_OPT_NO = VX_OPT_FLAGS = $(VX_OPT_$(VX_OPT)) # Include files -VX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) \ +VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/vxWorks -I$(VX_INCLUDE) # Warnings @@ -43,7 +43,7 @@ VX_WARN_FLAGS = $(VX_WARN_$(VX_WARN)) VX_OP_SYS_FLAGS = -DvxWorks -DV5_vxWorks # Arch dependent flags are set in CONFIG_ARCH.* -VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) $(USR_INCLUDES) \ +VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) \ $(VX_INCLUDES) $(VX_OP_SYS_FLAGS) #VX_LDFLAGS = -T$(EPICS_BASE)/src/libvxWorks/vxldscript.MRI -o @@ -64,7 +64,7 @@ LINK.c = $(LD) $(LDFLAGS) COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c LINK.cc = $(LD) $(LDFLAGS) -CPPSNCFLAGS = $(USR_INCLUDES) $(VX_INCLUDES) +CPPSNCFLAGS = $(VX_INCLUDES) DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS DEPENDS_RULE.cc = -$(COMPILE.cc) -M $(SRCS.cc) > .DEPENDS diff --git a/config/CONFIG.Vx.pc486 b/config/CONFIG.Vx.pc486 index 895028e67..e406d7353 100644 --- a/config/CONFIG.Vx.pc486 +++ b/config/CONFIG.Vx.pc486 @@ -55,7 +55,7 @@ VX_OPT_NO = -O0 VX_OPT_FLAGS = $(VX_OPT_$(VX_OPT)) # Include files -VX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) \ +VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/vxWorks -I$(VX_INCLUDE) # Warnings @@ -69,7 +69,7 @@ VX_WARN_FLAGS = $(VX_WARN_$(VX_WARN)) VX_OP_SYS_FLAGS = -DvxWorks -DV5_vxWorks # Arch dependent flags are set in CONFIG_ARCH.* -VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) $(USR_INCLUDES) \ +VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) \ $(VX_INCLUDES) $(VX_OP_SYS_FLAGS) VX_LDFLAGS = -o @@ -88,4 +88,4 @@ LINK.c = $(LD) $(LDFLAGS) CPPSNCFLAGS = $(USR_INCLUDES) $(VX_INCLUDES) DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) >> .DEPENDS -DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Vx.68k +DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.68k diff --git a/config/CONFIG.WIN32 b/config/CONFIG.WIN32 index 2230b2f6c..88fd47c6e 100644 --- a/config/CONFIG.WIN32 +++ b/config/CONFIG.WIN32 @@ -48,7 +48,7 @@ MKDIR=mkdir RMDIR=rm -rf # Include files -HOST_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) \ +HOST_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ -I$(EPICS_BASE_INCLUDE)/os/$(ARCH_CLASS) # Operating system flags (from win32.mak) @@ -87,7 +87,7 @@ WIN32LDFLAGS := $(WIN32SYSTEMLIBS) -nologo -subsystem:windows -dll\ HOST_LDLIBS:=$(WIN32SYSTEMLIBS) ARCH_DEP_CFLAGS = ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS) -HOST_CFLAGS = $(HOST_SFLAGS) $(USR_INCLUDES) $(HOST_INCLUDES) $(OP_SYS_FLAGS) +HOST_CFLAGS = $(HOST_SFLAGS) $(HOST_INCLUDES) $(OP_SYS_FLAGS) HOST_CXXFLAGS = $(HOST_CFLAGS) @@ -124,4 +124,4 @@ LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -Fe$@ # if you need different rules for .c and .cc, # that script has to figure out what to call. # -DEPENDS_RULE = @echo no DEPENDS_RULE defined in CONFIG.Host.WIN32 +DEPENDS_RULE = @echo no DEPENDS_RULE defined in CONFIG.WIN32 diff --git a/config/CONFIG.alpha b/config/CONFIG.alpha index 6415afc56..7cb9d90d7 100644 --- a/config/CONFIG.alpha +++ b/config/CONFIG.alpha @@ -78,7 +78,8 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(T_A) +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ + -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags OP_SYS_FLAGS = -DUNIX @@ -89,7 +90,7 @@ UNIX_LDLIBS = -lm ARCH_DEP_CFLAGS = -D_OSF_SOURCE -DLITTLE_ENDIAN ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS) -UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) +UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) UNIX_CXXFLAGS = $(UNIX_CFLAGS) @@ -114,6 +115,6 @@ COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -DEPEND_RULE.c = @echo no DEPENDS_RULE.c defined in CONFIG.Unix.alpha -DEPEND_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.alpha +DEPEND_RULE.c = @echo no DEPENDS_RULE.c defined in CONFIG.alpha +DEPEND_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.alpha diff --git a/config/CONFIG.hp700 b/config/CONFIG.hp700 index 30a349384..e4946a401 100644 --- a/config/CONFIG.hp700 +++ b/config/CONFIG.hp700 @@ -86,7 +86,8 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(T_A) +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ + -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags OP_SYS_FLAGS = -DUNIX @@ -98,7 +99,7 @@ UNIX_LDLIBS = -lm ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS) -UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) +UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) UNIX_CXXFLAGS = $(UNIX_CFLAGS) # Target specific flags @@ -123,6 +124,6 @@ COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -DEPENDS_RULE.c = @echo no DEPENDS_RULE.c defined in CONFIG.Unix.hp700 -DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.hp700 +DEPENDS_RULE.c = @echo no DEPENDS_RULE.c defined in CONFIG.hp700 +DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.hp700 diff --git a/config/CONFIG.sgi b/config/CONFIG.sgi index 596b86877..549add5b6 100644 --- a/config/CONFIG.sgi +++ b/config/CONFIG.sgi @@ -84,7 +84,8 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(T_A) +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ + -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags OP_SYS_FLAGS = -DUNIX @@ -94,7 +95,7 @@ UNIX_LDLIBS = -lm ARCH_DEP_CFLAGS = -DSGI ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS) -UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) +UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) UNIX_CXXFLAGS = $(UNIX_CFLAGS) @@ -121,4 +122,4 @@ LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) LOAD.c = ld -shared $(LDFLAGS) DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS -DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.sgi +DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.sgi diff --git a/config/CONFIG.solaris b/config/CONFIG.solaris index 7d1c3bebc..e89241686 100644 --- a/config/CONFIG.solaris +++ b/config/CONFIG.solaris @@ -118,7 +118,8 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(T_A) +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ + -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags OP_SYS_FLAGS = -DUNIX @@ -133,7 +134,7 @@ ARCH_DEP_LDLIBS = -lsocket -lnsl # -lsocket needed by libca.a # -lnsl needed by libca.a -UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(USR_INCLUDES) $(OP_SYS_FLAGS) +UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) UNIX_CXXFLAGS = $(UNIX_CFLAGS) @@ -160,4 +161,4 @@ LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) DEPENDS_RULE.c = -$(COMPILE.c) -xM $(SRCS.c) > .DEPENDS -DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.solaris +DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.solaris diff --git a/config/CONFIG.sun4 b/config/CONFIG.sun4 index 49a1579f5..825c1a8f0 100644 --- a/config/CONFIG.sun4 +++ b/config/CONFIG.sun4 @@ -116,7 +116,8 @@ OPTIM_NO = UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT)) # Include files -UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(T_A) +UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \ + -I$(EPICS_BASE_INCLUDE)/os/$(T_A) # Operating system flags OP_SYS_FLAGS = -DUNIX @@ -128,7 +129,7 @@ UNIX_LDLIBS = -lm $(CCOMPILER_LDLIBS) ARCH_DEP_CFLAGS = -DSUNOS4 ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS) -UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) +UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) UNIX_CXXFLAGS = $(UNIX_CFLAGS) @@ -157,4 +158,4 @@ LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS -DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.sun4 +DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.sun4