janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 05:13:56 +01:00
Code Activity

defs-orig.mk, rules.mk: Add support for profiler and cfg_*.mk inclusion mechanism

Browse source
This commit is contained in:
Jan Lindemann 2002-03-30 18:53:58 +00:00 • committed by Jan Lindemann
commit 1547f593fd
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
make/defs-orig.mk
View file

@ -23,6 +23,12 @@ 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 cat $(TOPDIR)/VERSION | grep 'dev' >/dev/null && echo true)
ifeq ($(DEVELOPMENT),true)
include $(TOPDIR)/make/cfg_dev.mk
else
include $(TOPDIR)/make/cfg_dist.mk
endif
GCC_VERSION = $(shell gcc -v 2>&1 | grep version | awk '{ print $$3;}') GCC_VERSION = $(shell gcc -v 2>&1 | grep version | awk '{ print $$3;}')
GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[1];}') GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[1];}')
@ -91,6 +97,11 @@ CPPFLAGS = $(INCLUDE) $(PROJECT_CPPFLAGS) $(CPPFLAGS_DEBUG) $(LOCAL_CPPFLAGS) $
LDFFTW = -lrfftw -lfftw -lm LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile #LDAUDIO = -laudiofile
ifeq ($(DEVELOPMENT),true)
CFLAGS += $(CFLAGS_DEBUG)
CPPFLAGS += $(CFLAGS_DEBUG)
endif
INSTALLED_SHOBJS = $(addprefix $(PREFIX)/lib/,$(SHOBJS)) INSTALLED_SHOBJS = $(addprefix $(PREFIX)/lib/,$(SHOBJS))
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
@ -119,13 +130,19 @@ ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS = -l$(LIBNAME) PROJECTLIB_LDFLAGS = -l$(LIBNAME)
endif endif
LDFLAGS = -L$(LIBDIR) $(PROJECTLIB_LDFLAGS) $(LOCAL_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) ifeq ($(USE_PROFILER),true)
LDREST = $(LDAUDIO) $(LDFFTW) -ldl CFLAGS += -fprofile-arcs -ftest-coverage
CC = $(YAMD)gcc CPPFLAGS += -fprofile-arcs -ftest-coverage
CPP = $(YAMD)g++ LDFLAGS += -fprofile-arcs -ftest-coverage
RM = rm endif
AR = ar
INSTALL = install LDFLAGS += -L$(LIBDIR) $(PROJECTLIB_LDFLAGS) $(LOCAL_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS)
LDREST += $(LDAUDIO) $(LDFFTW) -ldl
CC = $(YAMD)gcc
CPP = $(YAMD)g++
RM = rm
AR = ar
INSTALL = install
define make_subdirs define make_subdirs
set -e; for D in $(SUBDIRS) ; do make -C $$D ; done set -e; for D in $(SUBDIRS) ; do make -C $$D ; done

7
make/rules.mk
View file

@ -90,7 +90,7 @@ doneclean:
execlean: allclean objclean textclean execlean: allclean objclean textclean
distclean: clean objclean textclean tmpclean vcdistclean distclean: clean objclean textclean tmpclean vcdistclean profclean
localclean: $(LOCAL_CLEAN) localclean: $(LOCAL_CLEAN)
rm -rf $(CLEAN) rm -rf $(CLEAN)
@ -103,3 +103,8 @@ vcdistclean:
prereqclean: prereqclean:
for dir in $(PREREQ_DIR); do make -C $$dir clean; done for dir in $(PREREQ_DIR); do make -C $$dir clean; done
profclean:
rm -f *.da *.bb *.bbg *.gcov