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

make, scripts: Merged changes from V_1_2_0_6_JAN

Browse source
This commit is contained in:
Jan Lindemann 2011-06-14 20:14:59 +00:00 • committed by Jan Lindemann
commit 7a50ef5bd3
4 changed files with 791 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

62
make/defs.mk
View file

@ -185,7 +185,7 @@ LOCAL_C += $(wildcard *.c)
LOCAL_CPP += $(wildcard *.cc *.cpp *.C)
LOCAL_H += $(wildcard *.h *.H)
SFILES += $(wildcard *.S)
PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h))
#PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h))
ALL_H += $(LOCAL_H) $(PREREQ_H)
SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H)
SRC_C += $(filter %.c, $(SRC_ALL_CPP))
@ -193,12 +193,12 @@ SRC_CPP += $(filter %.cc %.cpp %.C, $(SRC_ALL_CPP))
OBJ += $(patsubst %.C,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.cc %.C, $(SRC_ALL_CPP))))))
OBJ += $(patsubst %.S,%.o,$(SFILES))
PREREQ_DIR += $(addprefix $(MODDIR)/,$(LOCAL_PREREQ))
PREREQ_DONE += $(addsuffix /all.done,$(PREREQ_DIR))
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_DIR += $(addprefix $(MODDIR)/,$(LOCAL_PREREQ))
#PREREQ_DONE += $(addsuffix /all.done,$(PREREQ_DIR))
#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)
CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS))
REQUIRED := $(CONTRIB_MOD) $(REQUIRED)
@ -626,8 +626,8 @@ ifeq ($(USE_MPATROL),true)
endif
ifeq ($(USE_VALGRIND),true)
CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
#CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
#CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
# LDFLAGS +=
endif
@ -708,7 +708,10 @@ ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
else
NO_OPT_FLAGS = \
-fno-inline-functions-called-once \
-fno-tree-loop-optimize
-fno-tree-loop-optimize \
-fno-early-inlining
# -fconserve-stack
_NO_OPT_FLAGS = \
-O0 \
@ -758,6 +761,7 @@ USE_JUX = true
INCLUDE += -I$(JUX2_DIR)/include
LIBFLAGS += -L$(JUX2_DIR)/lib -ljux2
EXE_SEARCH_PATH += $(JUX2_DIR)/bin
PREREQ += JUX2
endif
ifeq ($(USE_JUX),true)
@ -776,6 +780,7 @@ USE_JUX_SHARED = true
INCLUDE += -I$(JUX_DIR)/include
LIBFLAGS += -L$(JUX_DIR)/lib -ljux
EXE_SEARCH_PATH += $(JUX_DIR)/bin
PREREQ += JUX
endif
ifeq ($(USE_JUX_CLIENT_JAVA),true)
@ -785,6 +790,7 @@ RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-client-java-run = $(JUX_CLIENT
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-client-java-devel = $(JUX_CLIENT_JAVA_VERSION)
USE_JUX_CLIENT = true
LIBFLAGS += -L$(JUX_CLIENT_JAVA_DIR)/lib -ljux-client-java
PREREQ += JUX_CLIENT_JAVA
endif
ifeq ($(USE_JUX_CLIENT),true)
@ -797,6 +803,7 @@ USE_JUX_SHARED = true
INCLUDE += -I$(JUX_CLIENT_DIR)/include
LIBFLAGS += -L$(JUX_CLIENT_DIR)/lib -ljux-client
EXE_SEARCH_PATH += $(JUX_CLIENT_DIR)/bin
PREREQ += JUX_CLIENT
endif
ifeq ($(USE_JUX_SHARED),true)
@ -811,6 +818,7 @@ USE_FEEDFS_UTILS = true
USE_BTOOLS = true
INCLUDE += -I$(JUX_SHARED_DIR)/include
LIBFLAGS += -L$(JUX_SHARED_DIR)/lib -ljux-shared
PREREQ += JUX_SHARED
endif
ifeq ($(USE_CCASFS),true)
@ -823,6 +831,7 @@ USE_CCONSOLE = true
INCLUDE += -I$(CCASFS_DIR)/include
#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole
EXE_SEARCH_PATH += $(CCASFS_DIR)/bin
PREREQ += CCASFS
endif
ifeq ($(USE_CCONSOLE),true)
@ -839,6 +848,7 @@ LIBFLAGS += -L$(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)dspider/f
endif
LIBFLAGS += -ldspider-cconsole
EXE_SEARCH_PATH += $(CCONSOLE_DIR)/bin
PREREQ += CCONSOLE
endif
ifeq ($(USE_DSPCD),true)
@ -854,6 +864,7 @@ USE_USERVER = true
INCLUDE += -I$(DSPCD_DIR)/include
LIBFLAGS += -L$(DSPCD_EXE_PREFIX)/lib -ldspcd
EXE_SEARCH_PATH += $(DSCD_DIR)/bin
PREREQ += DSPCD
endif
ifeq ($(USE_DSPROUT),true)
@ -868,6 +879,7 @@ USE_USERVER = true
INCLUDE += -I$(DSPROUT_DIR)/include
LIBFLAGS += -L$(DSPROUT_EXE_PREFIX)/lib -ldsprout
EXE_SEARCH_PATH += $(DSPROUT_DIR)/bin
PREREQ += DSPROUT
endif
ifeq ($(USE_DSPIDER_SHARED),true)
@ -881,6 +893,7 @@ USE_YTOOLS = true
INCLUDE += -I$(DSPIDER_SHARED_DIR)/include
LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared
EXE_SEARCH_PATH += $(DSPIDER_SHARED_DIR)/bin
PREREQ += DSPIDER_SHARED
endif
ifeq ($(USE_FEEDFS_QT),true)
@ -894,6 +907,7 @@ USE_YTOOLS = true
INCLUDE += -I$(FEEDFS_QT_DIR)/include
LIBFLAGS += -L$(FEEDFS_QT_DIR)/lib -lfeedfs-qt
EXE_SEARCH_PATH += $(FEEDFS_QT_DIR)/bin
PREREQ += FEEDFS_QT
endif
ifeq ($(USE_FEEDFS_WT),true)
@ -909,6 +923,7 @@ USE_WT_JANNET = true
INCLUDE += -I$(FEEDFS_WT_DIR)/include
LIBFLAGS += -L$(FEEDFS_WT_DIR)/lib -lfeedfs-wt
EXE_SEARCH_PATH += $(FEEDFS_WT_DIR)/bin
PREREQ += FEEDFS_WT
endif
ifeq ($(USE_FEEDFS_GUI),true)
@ -923,6 +938,7 @@ USE_FEEDFS_QT = true
INCLUDE += -I$(FEEDFS_GUI_DIR)/include
LIBFLAGS += -L$(FEEDFS_GUI_DIR)/lib -lfeedfs-gui
EXE_SEARCH_PATH += $(FEEDFS_GUI_DIR)/bin
PREREQ += FEEDFS_GUI
endif
ifeq ($(USE_FEEDFSD),true)
@ -935,6 +951,7 @@ USE_YTOOLS = true
INCLUDE += -I$(FEEDFSD_DIR)/include
LIBFLAGS += -L$(FEEDFSD_DIR)/lib -lfeedfsd
EXE_SEARCH_PATH += $(FEEDFSD_DIR)/bin
PREREQ += FEEDFSD
endif
ifeq ($(USE_FEEDFS_LDAP),true)
@ -947,6 +964,7 @@ USE_YTOOLS = true
INCLUDE += -I$(FEEDFS_LDAP_DIR)/include
LIBFLAGS += -L$(FEEDFS_LDAP_DIR)/lib -lfeedfs-ldap -lldap
EXE_SEARCH_PATH += $(FEEDFS_LDAP_DIR)/bin
PREREQ += FEEDFS_LDAP
endif
ifeq ($(USE_FEEDFS_UTILS),true)
@ -960,6 +978,7 @@ USE_YTOOLS = true
INCLUDE += -I$(FEEDFS_UTILS_DIR)/include
LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils
EXE_SEARCH_PATH += $(FEEDFS_UTILS_DIR)/bin
PREREQ += FEEDFS_UTILS
endif
ifeq ($(USE_FEEDFS_NET),true)
@ -975,6 +994,7 @@ USE_YTOOLS = true
INCLUDE += -I$(FEEDFS_NET_DIR)/include
LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin
PREREQ += FEEDFS_NET
endif
ifeq ($(USE_FEEDFS_LOCAL),true)
@ -986,6 +1006,7 @@ USE_FEEDFS = true
# no build-time linkage necessary, no headers exported
LD_LIB_PATH += $(FEEDFS_LOCAL_DIR)/lib
EXE_SEARCH_PATH += $(FEEDFS_LOCAL_DIR)/bin
PREREQ += FEEDFS_LOCAL
endif
ifeq ($(USE_FEEDFS_REWRITE),true)
@ -998,6 +1019,7 @@ USE_FEEDFS = true
LD_LIB_PATH += $(FEEDFS_REWRITE_DIR)/lib
EXE_SEARCH_PATH += $(FEEDFS_REWRITE_DIR)/bin
LIBFLAGS += -lboost_regex
PREREQ += FEEDFS_REWRITE
endif
ifeq ($(USE_FEEDFS_FMEMFS),true)
@ -1011,6 +1033,7 @@ LD_LIB_PATH += $(FEEDFS_FMEMFS_DIR)/lib
INCLUDE += -I$(FEEDFS_FMEMFS_DIR)/include
LIBFLAGS += -L$(FEEDFS_FMEMFS_DIR)/lib -lfeedfs-fmemfs
EXE_SEARCH_PATH += $(FEEDFS_FMEMFS_DIR)/bin
PREREQ += FEEDFS_FMEMFS
endif
ifeq ($(USE_FEEDFS_SYSLOG),true)
@ -1024,6 +1047,7 @@ LD_LIB_PATH += $(FEEDFS_SYSLOG_DIR)/lib
INCLUDE += -I$(FEEDFS_SYSLOG_DIR)/include
LIBFLAGS += -L$(FEEDFS_SYSLOG_DIR)/lib -lfeedfs-syslog
EXE_SEARCH_PATH += $(FEEDFS_SYSLOG_DIR)/bin
PREREQ += FEEDFS_SYSLOG
endif
ifeq ($(USE_FEEDFS_OBJECTS),true)
@ -1036,6 +1060,7 @@ USE_YTOOLS = true
INCLUDE += -I$(FEEDFS_OBJECTS_DIR)/include
LIBFLAGS += -L$(FEEDFS_OBJECTS_DIR)/lib -lfeedfs-objects
EXE_SEARCH_PATH += $(FEEDFS_OBJECTS_DIR)/bin
PREREQ += FEEDFS_OBJECTS
endif
ifeq ($(USE_FEEDFS),true)
@ -1049,6 +1074,7 @@ USE_AUTH = true
INCLUDE += -I$(FEEDFS_DIR)/include
LIBFLAGS += -L$(FEEDFS_DIR)/lib -lfeedfs
EXE_SEARCH_PATH += $(FEEDFS_DIR)/bin
PREREQ += FEEDFS
endif
ifeq ($(USE_USERVER),true)
@ -1061,6 +1087,7 @@ USE_YTOOLS = true
INCLUDE += -I$(USERVER_DIR)/include
LIBFLAGS += -L$(USERVER_DIR)/lib -luserver
EXE_SEARCH_PATH += $(USERVER_DIR)/bin
PREREQ += USERVER
endif
ifeq ($(USE_XCHANGE),true)
@ -1073,6 +1100,7 @@ USE_VALDI = true
INCLUDE += -I$(XCHANGE_DIR)/include
LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange
EXE_SEARCH_PATH += $(XCHANGE_DIR)/bin
PREREQ += XCHANGE
endif
ifeq ($(USE_BTOOLS),true)
@ -1084,6 +1112,7 @@ USE_YTOOLS = true
INCLUDE += -I$(BTOOLS_DIR)/include
LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools
EXE_SEARCH_PATH += $(BTOOLS_DIR)/bin
PREREQ += BTOOLS
endif
ifeq ($(USE_JACKJART),true)
@ -1095,6 +1124,7 @@ USE_YTOOLS = true
INCLUDE += -I$(JACKJART_DIR)/include
LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart
EXE_SEARCH_PATH += $(JACKJART_DIR)/bin
PREREQ += JACKJART
endif
ifeq ($(USE_JACKRTAI),true)
@ -1106,6 +1136,7 @@ USE_YTOOLS = true
INCLUDE += -I$(JACKRTAI_DIR)/include
LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai
EXE_SEARCH_PATH += $(JACKRTAI_DIR)/bin
PREREQ += JACKRTAI
endif
ifeq ($(USE_JACKDUMMY),true)
@ -1117,6 +1148,7 @@ USE_YTOOLS = true
INCLUDE += -I$(JACKDUMMY_DIR)/include
LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy
EXE_SEARCH_PATH += $(JACKDUMMY_DIR)/bin
PREREQ += JACKDUMMY
endif
ifeq ($(USE_ALSART),true)
@ -1128,6 +1160,7 @@ USE_YTOOLS = true
INCLUDE += -I$(ALSART_DIR)/include
LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart
EXE_SEARCH_PATH += $(ALSART_DIR)/bin
PREREQ += ALSART
endif
ifeq ($(USE_DSPFS),true)
@ -1139,6 +1172,7 @@ USE_YTOOLS = true
INCLUDE += -I$(DSPFS_DIR)/include
LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs
EXE_SEARCH_PATH += $(DSPFS_DIR)/bin
PREREQ += DSPFS
endif
ifeq ($(USE_AUTH),true)
@ -1151,6 +1185,7 @@ USE_VALDI = true
INCLUDE += -I$(AUTH_DIR)/include
LIBFLAGS += -L$(AUTH_DIR)/lib -lauth
EXE_SEARCH_PATH += $(AUTH_DIR)/bin
PREREQ += AUTH
endif
ifeq ($(USE_VALDI),true)
@ -1160,8 +1195,10 @@ RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)valdi-run = $(VALDI_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION)
USE_YTOOLS = true
#INCLUDE += -I$(VALDI_DIR)/include
LIBFLAGS += -L$(VALDI_DIR)/lib
#LIBFLAGS += -L$(VALDI_DIR)/lib -lvaldi
EXE_SEARCH_PATH += $(VALDI_DIR)/bin
PREREQ += VALDI
endif
ifeq ($(USE_WT_JANNET),true)
@ -1175,6 +1212,8 @@ USE_FEEDFS = true
INCLUDE += -I$(WT_JANNET_DIR)/include
LD_LIB_PATH += $(WT_JANNET_DIR)/lib
EXE_SEARCH_PATH += $(WT_JANNET_DIR)/bin
PREREQ += WT_JANNET
CATCH_ONLY_YERROR = false
endif
ifeq ($(USE_APACHE2_JANNET),true)
@ -1186,6 +1225,7 @@ USE_FEEDFS = true
# no build-time linkage necessary, no headers exported
LD_LIB_PATH += $(APACHE2_JANNET_DIR)/lib
EXE_SEARCH_PATH += $(APACHE2_JANNET_DIR)/bin
PREREQ += APACHE2_JANNET
endif
ifeq ($(USE_FPTEST),true)
@ -1197,6 +1237,7 @@ USE_YTOOLS = true
INCLUDE += -I$(FPTEST_DIR)/include
LIBFLAGS += -L$(FPTEST_DIR)/lib -lfptest -L$(HOME)/opt/iowkit/lib -liowkit
EXE_SEARCH_PATH += $(FPTEST_DIR)/bin
PREREQ += FPTEST
endif
ifeq ($(USE_YTOOLS),true)
@ -1213,6 +1254,7 @@ endif
INCLUDE += -I$(YTOOLS_DIR)/include
LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools
EXE_SEARCH_PATH += $(YTOOLS_DIR)/bin
PREREQ += YTOOLS
endif
ifeq ($(USE_SCOPE_CASMIX),true)