janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 15:03:55 +01:00
Code Activity

defs.mk: Add USE_YTOOLS variable, defaulting to true

Browse source
This commit is contained in:
Jan Lindemann 2007-06-17 13:09:03 +00:00 • committed by Jan Lindemann
commit 12e5ed0adc
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/defs.mk
View file

@ -13,6 +13,7 @@ HEX_VERSION = $(shell echo $(DIST_VERSION) | \
sed 's/-dev//; s/pre[^\.]*//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x") sed 's/-dev//; s/pre[^\.]*//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
DEVELOPMENT ?= $(shell grep -q 'dev' $(TOPDIR)/VERSION && echo true) DEVELOPMENT ?= $(shell grep -q 'dev' $(TOPDIR)/VERSION && echo true)
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
USE_YTOOLS ?= true
REENTRANT ?= true REENTRANT ?= true
export REENTRANT export REENTRANT
@ -39,7 +40,6 @@ DIST_VERSION = $(shell echo $(VERSION) | sed -e "s/-dev//")
DIST_WINVERSION = $(shell echo $(WINVERSION) | sed -e "s/-dev//") DIST_WINVERSION = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//") LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//") LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
#DEVELOPMENT = $(shell echo $(VERSION) | grep 'dev' >/dev/null && echo true)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
CVS_ROOT_DIR = $(shell test -d CVS && pwd | sed -e "s%`cat CVS/Repository`%%; s%/$$%%") CVS_ROOT_DIR = $(shell test -d CVS && pwd | sed -e "s%`cat CVS/Repository`%%; s%/$$%%")
REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}') REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
@ -284,10 +284,15 @@ endif
# ----- standard features, switched on with USE_XXX = true # ----- standard features, switched on with USE_XXX = true
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS += -l$(LIBNAME) -L$(MODDIR)/lib PROJECTLIB_LDFLAGS += -l$(LIBNAME) -L$(TOPDIR)/lib
LD_LIB_PATH += $(TOPDIR)/lib LD_LIB_PATH += $(TOPDIR)/lib
endif endif
ifeq ($(USE_YTOOLS),true)
PROJECTLIB_LDFLAGS += -lytools -L$(MODDIR)/lib
LD_LIB_PATH += $(MODDIR)/lib
endif
ifeq ($(USE_TIMER),true) ifeq ($(USE_TIMER),true)
CFLAGS += -D_USE_TIMER_ CFLAGS += -D_USE_TIMER_
CPPFLAGS += -D_USE_TIMER_ CPPFLAGS += -D_USE_TIMER_