janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

defs.mk: Add USE_GFILTER

Browse source
This commit is contained in:
Jan Lindemann 2007-06-19 10:49:19 +00:00 • committed by Jan Lindemann
commit 03e1691b18
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/defs.mk
View file

@ -15,6 +15,8 @@ DEVELOPMENT ?= $(shell grep -q 'dev' $(TOPDIR)/VERSION && echo true)
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
USE_YTOOLS ?= true USE_YTOOLS ?= true
REENTRANT ?= true REENTRANT ?= true
USE_GFILTER ?= true
export REENTRANT export REENTRANT
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
@ -221,11 +223,6 @@ endif
# do a conditional include of timer headers, yet # do a conditional include of timer headers, yet
GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
CPP = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt))
ifeq ($(strip $(CPP)),sh)
CPP = g++
endif
RM = rm RM = rm
AR = ar AR = ar
@ -283,6 +280,15 @@ endif
# ----- standard features, switched on with USE_XXX = true # ----- standard features, switched on with USE_XXX = true
ifeq ($(USE_GFILTER),true)
CPP = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt))
ifeq ($(strip $(CPP)),sh)
CPP = g++
endif
else
CPP = g++
endif
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS += -l$(LIBNAME) -L$(TOPDIR)/lib PROJECTLIB_LDFLAGS += -l$(LIBNAME) -L$(TOPDIR)/lib
LD_LIB_PATH += $(TOPDIR)/lib LD_LIB_PATH += $(TOPDIR)/lib