From 58b02d04cb9aebe7fd52114d895cfb5c072c8e36 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Sat, 2 Nov 1996 00:35:42 +0000 Subject: [PATCH] os depen -I --- config/CONFIG.Vx.68k | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/CONFIG.Vx.68k b/config/CONFIG.Vx.68k index 807ffde31..00d6df739 100644 --- a/config/CONFIG.Vx.68k +++ b/config/CONFIG.Vx.68k @@ -16,7 +16,7 @@ LD = $(VX_GNU_BIN)/ld68k -r EPICS_LDLIBS = MV=mv RM=rm -f -MKDIR=mkdir +MKDIR = mkdir RMDIR=rm -rf # special c library requirements @@ -29,7 +29,8 @@ VX_OPT_NO = VX_OPT_FLAGS = $(VX_OPT_$(VX_OPT)) # Include files -VX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(VX_INCLUDE) +VX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) \ + -I$(EPICS_BASE_INCLUDE)/os/vxWorks -I$(VX_INCLUDE) # Warnings #At some time we should turn on pedantic @@ -45,6 +46,7 @@ VX_OP_SYS_FLAGS = -DvxWorks -DV5_vxWorks VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) $(USR_INCLUDES) \ $(VX_INCLUDES) $(VX_OP_SYS_FLAGS) +#VX_LDFLAGS = -T$(EPICS_BASE)/src/libvxWorks/vxldscript.MRI -o VX_LDFLAGS = -o TARGET_CFLAGS = $($(basename $@)_CFLAGS) @@ -56,12 +58,11 @@ CFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS) CXXFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS) LDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(VX_LDFLAGS) CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) - # Build compile line here COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c LINK.c = $(LD) $(LDFLAGS) COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -LINK.cc = $(LD) $(LDFLAGS) +LINK.cc = $(LD) $(LDFLAGS) CPPSNCFLAGS = $(USR_INCLUDES) $(VX_INCLUDES)