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

defs.mk: Fix missing -dev in development version

Browse source 
- (Hopefully) fixed missing -dev in development version
  - Remove duplicate -D_DO_TRACE_
This commit is contained in:
Jan Lindemann 2007-06-17 13:01:37 +00:00 • committed by Jan Lindemann
commit 46fa667cce
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/defs.mk
View file

@ -7,8 +7,9 @@
PROJECT ?= $(shell (cd $(TOPDIR); basename `pwd`)) PROJECT ?= $(shell (cd $(TOPDIR); basename `pwd`))
PROJECT_DESCR ?= No description PROJECT_DESCR ?= No description
CUSTOMER ?= No customer CUSTOMER ?= No customer
VERSION ?= $(shell sed -e "s/-dev//" $(TOPDIR)/VERSION) VERSION ?= $(shell cat $(TOPDIR)/VERSION)
HEX_VERSION = $(shell echo $(VERSION) | \ DIST_VERSION ?= $(shell sed -e "s/-dev//" $(TOPDIR)/VERSION)
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
@ -315,11 +316,6 @@ ifeq ($(USE_VALGRIND),true)
# LDFLAGS += # LDFLAGS +=
endif endif
ifeq ($(USE_TRACING),true)
CFLAGS += -D_DO_TRACE_
CPPFLAGS += -D_DO_TRACE_
endif
ifeq ($(USE_STACK_PROTECTOR),true) ifeq ($(USE_STACK_PROTECTOR),true)
CFLAGS += -fstack-protector-all CFLAGS += -fstack-protector-all
# CFLAGS += -fstack-protector # CFLAGS += -fstack-protector