From 0846c1dd5b886b3677d6b11d799b83d6c56f3604 Mon Sep 17 00:00:00 2001 From: zimoch Date: Fri, 6 May 2011 12:17:02 +0000 Subject: [PATCH] don't link to PCRE here, that has been done in stream library already. --- streamApp/Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/streamApp/Makefile b/streamApp/Makefile index fb45bd4..6c6d6ac 100644 --- a/streamApp/Makefile +++ b/streamApp/Makefile @@ -25,21 +25,10 @@ PROD_SRCS_vxWorks = -nil- PROD_LIBS = stream -ifdef PCRE -# With local PCRE package -PROD_LIBS += pcre -else -ifneq ($(words $(PCRE_LIB) $(PCRE_INCLUDE)),0) -# With system wide PCRE installation -PROD_SYS_LIBS += pcre -PROD_DEPLIB_DIRS += $(PCRE_LIB) -endif -endif - ifdef ASYN # Which types of asyn busses do you have? ifneq ($(OS_CLASS), WIN32) -# asynDriver up to version 4-8 does not support serial port for Windows! +# asynDriver up to version 4-16 does not support serial port for Windows! streamApp_DBD += drvAsynSerialPort.dbd endif streamApp_DBD += drvAsynIPPort.dbd @@ -69,7 +58,7 @@ include $(TOP)/configure/RULES clean:: myclean myclean: - rm -f core* StreamDebug.log + $(RM) core* StreamDebug.log endif