From 53e919458fd10f78980678060ad449496def6feb Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 17 Oct 2005 11:12:02 +0000 Subject: [PATCH] defs.mk: Add most of the contents to variables instead of assigning it --- make/defs.mk | 121 +++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 40e92b51..54842723 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -43,61 +43,60 @@ YTOOLS_VERSION_STR = \"@PACKAGE_VERSION@\" CPP = g++ -EXE_SH = $(wildcard *.sh) -MKFILES = $(wildcard *.mk) +EXE_SH += $(wildcard *.sh) +MKFILES += $(wildcard *.mk) +LOCAL_H += $(wildcard *.h) +LOCAL_C += $(wildcard *.c) +LOCAL_CPP += $(wildcard *.c *.cpp *.cc *.C) +LOCAL_CSRC += $(LOCAL_H) $(LOCAL_C) $(LOCAL_CPP) FULL_NAME = $(shell grep "^`id -nu`": /etc/passwd | cut -d: -f5) -SRC_SUFFIX = $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*))) -SRC_FILES = Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX))) -SRC_HEADERED = $(shell if [ "$(SRC_FILES)" ]; then grep -ic "it services" $(SRC_FILES) | sed '/:0$$/ d; s/:.*$$//'; fi) -SRC_UNHEADERED = $(filter-out $(SRC_HEADERED),$(SRC_FILES)) -CFILES = $(wildcard *.c) -CPPFILES = $(wildcard *.cc *.cpp) -SFILES = $(wildcard *.S) -UIFILES = $(wildcard *.ui) -RCCFILES = $(wildcard *.qrc) -CALLSRC = $(CFILES) $(CPPFILES) -OBJ = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC)))) +SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*))) +SRC_FILES += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX))) +SRC_HEADERED+= $(shell if [ "$(SRC_FILES)" ]; then grep -ic "it services" $(SRC_FILES) | sed '/:0$$/ d; s/:.*$$//'; fi) +SRC_UNHEADERED+= $(filter-out $(SRC_HEADERED),$(SRC_FILES)) +CFILES += $(wildcard *.c) +CPPFILES += $(wildcard *.cc *.cpp) +SFILES += $(wildcard *.S) +UIFILES += $(wildcard *.ui) +RCCFILES += $(wildcard *.qrc) +CALLSRC += $(CFILES) $(CPPFILES) +OBJ += $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC)))) OBJ += $(patsubst %.S,%.o,$(SFILES)) SHOBJS += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC)))) -SHSCRIPTS = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl)) -SCRIPTS = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) -LOCAL_HDR = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h)) -LOCAL_EXE_SH = $(patsubst %.sh,$(TOPDIR)/bin/%.sh,$(wildcard *.sh)) +SHSCRIPTS += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl)) +SCRIPTS += $(patsubst %.tmpl,%,$(wildcard *.tmpl)) +LOCAL_HDR += $(patsubst %.h,$(TOPDIR)/include/%.h,$(LOCAL_H)) +LOCAL_EXE_SH+= $(patubst %.sh,$(TOPDIR)/bin/%.sh,$(EXE_SH)) -LOCAL_H = $(wildcard *.h) -LOCAL_C = $(wildcard *.c) -LOCAL_CPP = $(wildcard *.c *.cpp *.cc *.C) -LOCAL_CSRC = $(LOCAL_H) $(LOCAL_C) $(LOCAL_CPP) - -PREREQ_DIR = $(addprefix $(MODDIR)/,$(LOCAL_PREREQ)) -PREREQ_DONE = $(addsuffix /all.done,$(PREREQ_DIR)) -PREREQ_H = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h)) -PREREQ_C = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) -PREREQ_CPP = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \ +PREREQ_DIR += $(addprefix $(MODDIR)/,$(LOCAL_PREREQ)) +PREREQ_DONE += $(addsuffix /all.done,$(PREREQ_DIR)) +PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h)) +PREREQ_C += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) +PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \ $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) -PREREQ_CSRC = $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP) +PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP) -CONTRIB_MOD = $(addprefix contrib/,$(CONTRIB_LIBS)) +CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS)) REQUIRED := $(CONTRIB_MOD) $(REQUIRED) -REQUIRED_DIR = $(patsubst %,$(MODDIR)/%,$(REQUIRED)) -REQUIRED_DONE = $(patsubst %,%/all.done,$(REQUIRED_DIR)) -REQUIRED_H = $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) -REQUIRED_C = $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) -REQUIRED_CPP = $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.cpp)) \ +REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED)) +REQUIRED_DONE+= $(patsubst %,%/all.done,$(REQUIRED_DIR)) +REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) +REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) +REQUIRED_CPP += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.cpp)) \ $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) -REQUIRED_CSRC = $(REQUIRED_H) $(REQUIRED_C) $(REQUIRED_CPP) +REQUIRED_CSRC+= $(REQUIRED_H) $(REQUIRED_C) $(REQUIRED_CPP) -ALL_H = $(LOCAL_H) $(PREREQ_H) -ALL_C = $(LOCAL_C) $(PREREQ_CPP) -ALL_CPP = $(LOCAL_CPP) $(PREREQ_CPP) +ALL_H += $(LOCAL_H) $(PREREQ_H) +ALL_C += $(LOCAL_C) $(PREREQ_CPP) +ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP) -ALL_CSRC = $(LOCAL_CSRC) $(PREREQ_CSRC) +ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) -TEXTCLEAN = $(wildcard *~ .*~ .*.swp *.rep) +TEXTCLEAN += $(wildcard *~ .*~ .*.swp *.rep) -INCLUDE = -I. -I$(TOPDIR)/include $(PROJECT_INCLUDE) $(LOCAL_INCLUDE) +INCLUDE += -I. -I$(TOPDIR)/include $(PROJECT_INCLUDE) $(LOCAL_INCLUDE) ifneq ($(TOPDIR),$(MODDIR)) INCLUDE += -I$(MODDIR)/include @@ -123,8 +122,8 @@ BUILD_BINDIR = $(TOPDIR)/bin LIBDIR = $(TOPDIR)/lib INSTALL_DOCDIR_DIST = $(DOC_PREFIX) INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel -DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html) -DOCSUBDIRS = $(wildcard html tex info examples src) +DOCS += $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html) +DOCSUBDIRS += $(wildcard html tex info examples src) INSTALLED_VERSION_FILE = $(PREFIX)/VERSION @@ -136,24 +135,24 @@ LIB_A = $(LIBDIR)/lib$(LIBNAME).a LIB_SO = $(LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) VERSION_SCRIPT = $(LIBDIR)/version.ldscript INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) -INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) -INSTALLED_LINKS_SO = $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO)) -LINKS_SO = $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO)) +INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) +INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO)) +LINKS_SO += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO)) INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a -INSTALLED_EXE = $(INSTALL_BINDIR)/$(EXE) -INSTALLED_EXE_SH = $(addprefix $(INSTALL_BINDIR)/,$(EXE_SH)) -INSTALLED_EXE_BIN = $(addprefix $(INSTALL_BINDIR)/,$(EXE_BIN)) -INSTALLED_MKFILES = $(addprefix $(INSTALL_MKDIR)/,$(MKFILES)) -INSTALLED_H = $(addprefix $(INSTALL_HDRDIR)/,$(LOCAL_H)) +INSTALLED_EXE += $(INSTALL_BINDIR)/$(EXE) +INSTALLED_EXE_SH += $(addprefix $(INSTALL_BINDIR)/,$(EXE_SH)) +INSTALLED_EXE_BIN += $(addprefix $(INSTALL_BINDIR)/,$(EXE_BIN)) +INSTALLED_MKFILES += $(addprefix $(INSTALL_MKDIR)/,$(MKFILES)) +INSTALLED_H += $(addprefix $(INSTALL_HDRDIR)/,$(LOCAL_H)) INSTALLED_PROFILE_PATH_SCRIPT = $(ENV_PREFIX)/etc/profile.d/path_$(PROJECT).sh -MEMBERS = $(LIB_A)($(OBJ)) +MEMBERS += $(LIB_A)($(OBJ)) #PREFIX = ../# CAUTION: This breaks the installation in the project -#MEMWATCH = -DMEMWATCH -DMW_STDIO -#YAMD = yamd- -#EFENCE = -lefence +#MEMWATCH += -DMEMWATCH -DMW_STDIO +#YAMD = yamd- +#EFENCE += -lefence #CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production ifeq ($(DEVELOPMENT),true) @@ -163,12 +162,12 @@ endif CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(YLIB_CFLAGS) $(INCLUDE) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(YLIB_CPPFLAGS) $(INCLUDE) -LDFFTW = -lrfftw -lfftw -lm +LDFFTW += -lrfftw -lfftw -lm #LDAUDIO = -laudiofile -CORE = $(wildcard core core.*) +CORE += $(wildcard core core.*) ifeq ($(USE_QT),true) -USE_X = true +USE_X = true ifeq ($(QT_VERSION),2) QT_PREFIX = /usr/lib/qt2 @@ -318,9 +317,9 @@ endif ifeq ($(USE_COMPILER_DEBUG_OPTS),true) - CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) - CPPFLAGS_DEBUG = $(CFLAGS_DEBUG) - LDFLAGS_DEBUG = + CFLAGS_DEBUG += -Wall -D_DEBUG_ -g3 $(MEMWATCH) + CPPFLAGS_DEBUG += $(CFLAGS_DEBUG) + LDFLAGS_DEBUG += PROJECT_CFLAGS += $(CFLAGS_DEBUG) PROJECT_CPPFLAGS += $(CFLAGS_DEBUG)