janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-20 13:37:38 +01:00
Code Activity

$(TOPDIR), make, scripts: Merged changes from V_1_1_31_6_POST_ACCEPTANCE

Browse source
This commit is contained in:
Jan Lindemann 2011-05-15 18:28:19 +00:00 • committed by Jan Lindemann
commit d1857e8d77
14 changed files with 251 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

117
make/defs.mk
View file

@ -111,10 +111,15 @@ else
endif
endif
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\"
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\"
LDFLAGS += -Wall
ifneq ($(LOG_QUAL_PREFIX),)
PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
endif
ifeq ($(CATCH_ONLY_YERROR),true)
CFLAGS += -DCATCH_ONLY_YERROR
CPPFLAGS += -DCATCH_ONLY_YERROR
@ -185,7 +190,7 @@ ALL_H += $(LOCAL_H) $(PREREQ_H)
SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H)
SRC_C += $(filter %.c, $(SRC_ALL_CPP))
SRC_CPP += $(filter %.cc %.cpp %.C, $(SRC_ALL_CPP))
OBJ += $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.cc, $(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))
@ -217,7 +222,7 @@ UPLOAD_URL_RPM_SRC = rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rp
PUBLIC_PATH_DEVEL_DOC = /proj/devel-docs
UPLOAD_URL_DEVEL_DOC = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC)
IMAGES += $(wildcard *.png *.jpg *.bmp)
IMAGES += $(wildcard *.png *.jpg *.bmp *.gif)
# -- standard dirs and files for build and install
@ -692,15 +697,19 @@ ifeq ($(USE_STACK_CHECK),true)
endif
ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
CFLAGS += -g3
CPPFLAGS += -g3
LDFLAGS += -g3
CFLAGS += -g3 -ggdb
CPPFLAGS += -g3 -ggdb
LDFLAGS += -g3 -ggdb
endif
ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
CFLAGS += -funroll-loops -O2
CPPFLAGS += -funroll-loops -O2
else
NO_OPT_FLAGS = \
-fno-inline-functions-called-once \
-fno-tree-loop-optimize
_NO_OPT_FLAGS = \
-O0 \
-fno-implicit-inline-templates \
@ -735,6 +744,75 @@ endif
# -- use of supplementary libraries
ifeq ($(USE_JUX2),true)
JUX2_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux2 /opt/$(FLAVOUR_PATH_PREFIX)jux2))
JUX2_VERSION = $(call version,$(JUX2_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux2-run = $(JUX2_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux2-devel = $(JUX2_VERSION)
USE_YTOOLS = true
USE_FEEDFS = true
USE_FEEDFS_OBJECTS = true
USE_FEEDFS_UTILS = true
USE_BTOOLS = true
USE_JUX = true
INCLUDE += -I$(JUX2_DIR)/include
LIBFLAGS += -L$(JUX2_DIR)/lib -ljux2
EXE_SEARCH_PATH += $(JUX2_DIR)/bin
endif
ifeq ($(USE_JUX),true)
JUX_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux /opt/$(FLAVOUR_PATH_PREFIX)jux))
JUX_VERSION = $(call version,$(JUX_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-run = $(JUX_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-devel = $(JUX_VERSION)
USE_YTOOLS = true
USE_FEEDFS = true
USE_FEEDFS_OBJECTS = true
USE_FEEDFS_UTILS = true
USE_FEEDFS_NET = true
USE_FEEDFS_LOCAL = true
USE_BTOOLS = true
USE_JUX_SHARED = true
INCLUDE += -I$(JUX_DIR)/include
LIBFLAGS += -L$(JUX_DIR)/lib -ljux
EXE_SEARCH_PATH += $(JUX_DIR)/bin
endif
ifeq ($(USE_JUX_CLIENT_JAVA),true)
JUX_CLIENT_JAVA_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-client-java /opt/$(FLAVOUR_PATH_PREFIX)jux-client-java))
JUX_CLIENT_JAVA_VERSION = $(call version,$(JUX_CLIENT_JAVA_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-client-java-run = $(JUX_CLIENT_JAVA_VERSION)
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
endif
ifeq ($(USE_JUX_CLIENT),true)
JUX_CLIENT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-client /opt/$(FLAVOUR_PATH_PREFIX)jux-client))
JUX_CLIENT_VERSION = $(call version,$(JUX_CLIENT_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-client-run = $(JUX_CLIENT_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-client-devel = $(JUX_CLIENT_VERSION)
USE_FEEDFS_NET = true
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
endif
ifeq ($(USE_JUX_SHARED),true)
JUX_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-shared /opt/$(FLAVOUR_PATH_PREFIX)jux-shared))
JUX_SHARED_VERSION = $(call version,$(JUX_SHARED_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-shared-run = $(JUX_SHARED_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-shared-devel = $(JUX_SHARED_VERSION)
USE_YTOOLS = true
USE_FEEDFS = true
USE_FEEDFS_OBJECTS = true
USE_FEEDFS_UTILS = true
USE_BTOOLS = true
INCLUDE += -I$(JUX_SHARED_DIR)/include
LIBFLAGS += -L$(JUX_SHARED_DIR)/lib -ljux-shared
endif
ifeq ($(USE_CCASFS),true)
CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/ccasfs /opt/$(FLAVOUR_PATH_PREFIX)dspider/ccasfs))
CCASFS_VERSION = $(call version,$(CCASFS_DIR))
@ -818,8 +896,23 @@ LIBFLAGS += -L$(FEEDFS_QT_DIR)/lib -lfeedfs-qt
EXE_SEARCH_PATH += $(FEEDFS_QT_DIR)/bin
endif
ifeq ($(USE_FEEDFS_WT),true)
FEEDFS_WT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-wt /opt/$(FLAVOUR_PATH_PREFIX)feedfs-wt))
FEEDFS_WT_VERSION = $(call version,$(FEEDFS_WT_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-wt-run = $(FEEDFS_WT_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-wt-devel = $(FEEDFS_WT_VERSION)
USE_FEEDFS_UTILS = true
USE_FEEDFS = true
USE_YTOOLS = true
USE_FEEDFS_GUI = true
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
endif
ifeq ($(USE_FEEDFS_GUI),true)
FEEDFS_GUI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-gui /opt/$(FLAVOUR_PATH_PREFIX)feedfs-gui))
FEEDFS_GUI_DIR ?= $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-gui /opt/$(FLAVOUR_PATH_PREFIX)feedfs-gui))
FEEDFS_GUI_VERSION = $(call version,$(FEEDFS_GUI_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-gui-run = $(FEEDFS_GUI_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION)
@ -877,6 +970,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-net-devel = $(FEEDFS_NET_VE
USE_FEEDFS_OBJECTS = true
USE_FEEDFS_UTILS = true
USE_XCHANGE = true
USE_FEEDFS_FMEMFS = true
USE_YTOOLS = true
INCLUDE += -I$(FEEDFS_NET_DIR)/include
LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
@ -933,7 +1027,7 @@ EXE_SEARCH_PATH += $(FEEDFS_SYSLOG_DIR)/bin
endif
ifeq ($(USE_FEEDFS_OBJECTS),true)
FEEDFS_OBJECTS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects))
FEEDFS_OBJECTS_DIR ?= $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects))
FEEDFS_OBJECTS_VERSION = $(call version,$(FEEDFS_OBJECTS_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-objects-run = $(FEEDFS_OBJECTS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION)
@ -1079,7 +1173,6 @@ RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)wt-jannet-run = $(WT_JANNET_VERSIO
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)wt-jannet-devel = $(WT_JANNET_VERSION)
USE_FEEDFS = true
INCLUDE += -I$(WT_JANNET_DIR)/include
LIBFLAGS += -L$(WT_JANNET_DIR)/lib -lwt-jannet
LD_LIB_PATH += $(WT_JANNET_DIR)/lib
EXE_SEARCH_PATH += $(WT_JANNET_DIR)/bin
endif
@ -1159,6 +1252,10 @@ ifeq ($(USE_GLIB),true)
endif
endif
ifeq ($(USE_WT),true)
LIBFLAGS += -L$(WT_JANNET_DIR)/lib -lwt-jannet -lwt -lwtext -lwthttp -lwtfcgi
endif
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)