mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
$(TOPDIR), make, scripts: Merged changes from V_1_2_3_33_YAPPLICATION_INIFILE_CTOR
Signed-off-by: Jan Lindemann <jan@jannet.de>
This commit is contained in:
Jan Lindemann
parent
6fbb886828
commit
78bd6215b4
12 changed files with 346 additions and 28 deletions
104
make/defs.mk
104
make/defs.mk
|
|
@ -769,6 +769,7 @@ ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
|
|||
BUILD_CPPFLAGS += -funroll-loops -O2
|
||||
else
|
||||
NO_OPT_FLAGS = \
|
||||
-g -fno-inline -fno-omit-frame-pointer -fno-builtin -fno-optimize-sibling-calls \
|
||||
-fno-inline-functions-called-once \
|
||||
-fno-tree-loop-optimize \
|
||||
-fno-early-inlining
|
||||
|
|
@ -929,18 +930,18 @@ PREREQ += DSPCD
|
|||
endif
|
||||
|
||||
ifneq ($(filter dspcd-ec,$(PREREQ_BUILD)),)
|
||||
DSPCD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider/dspcd-ec))
|
||||
DSPCD_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider))
|
||||
DSPCD_EC_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-ec $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider/dspcd-ec))
|
||||
DSPCD_EC_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-ec $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider))
|
||||
# include $(DSPCD_DIR)/make/public.mk
|
||||
DSPIDER_DSPCD_VERSION = $(call version,$(DSPCD_DIR))
|
||||
DSPIDER_DSPCD_EC_VERSION = $(call version,$(DSPCD_EC_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-ec-run = $(DSPIDER_DSPCD_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-ec-devel = $(DSPIDER_DSPCD_VERSION)
|
||||
PREREQ_BUILD += ytools
|
||||
PREREQ_BUILD += dspider-shared-ec
|
||||
PREREQ_BUILD += userver
|
||||
INCLUDE += -I$(DSPCD_DIR)/include
|
||||
LIBFLAGS += -L$(DSPCD_EXE_PREFIX)/lib -ldspcd-ec
|
||||
PREREQ += DSPCD
|
||||
PREREQ_BUILD += userver xchange
|
||||
INCLUDE += -I$(DSPCD_EC_DIR)/include
|
||||
LIBFLAGS += -L$(DSPCD_EC_EXE_PREFIX)/lib -ldspcd-ec
|
||||
PREREQ += DSPCD_EC
|
||||
endif
|
||||
|
||||
ifneq ($(filter dsprout,$(PREREQ_BUILD)),)
|
||||
|
|
@ -973,17 +974,17 @@ PREREQ += DSPIDER_SHARED
|
|||
endif
|
||||
|
||||
ifneq ($(filter dspider-shared-ec,$(PREREQ_BUILD)),)
|
||||
DSPIDER_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider/shared-ec))
|
||||
DSPIDER_SHARED_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider))
|
||||
include $(DSPIDER_SHARED_DIR)/make/public.mk
|
||||
DSPIDER_SHARED_VERSION = $(call version,$(DSPIDER_SHARED_DIR))
|
||||
DSPIDER_SHARED_EC_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared-ec $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider/shared-ec))
|
||||
DSPIDER_SHARED_EC_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared-ec $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider))
|
||||
include $(DSPIDER_SHARED_EC_DIR)/make/public.mk
|
||||
DSPIDER_SHARED_EC_VERSION = $(call version,$(DSPIDER_SHARED_EC_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-ec-run = $(DSPIDER_SHARED_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-ec-devel = $(DSPIDER_SHARED_VERSION)
|
||||
PREREQ_BUILD += ytools
|
||||
INCLUDE += -I$(DSPIDER_SHARED_DIR)/include
|
||||
LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared-ec
|
||||
EXE_SEARCH_PATH += $(DSPIDER_SHARED_DIR)/bin
|
||||
PREREQ += DSPIDER_SHARED
|
||||
INCLUDE += -I$(DSPIDER_SHARED_EC_DIR)/include
|
||||
LIBFLAGS += -L$(DSPIDER_SHARED_EC_EXE_PREFIX)/lib -ldspider-shared-ec
|
||||
EXE_SEARCH_PATH += $(DSPIDER_SHARED_EC_DIR)/bin
|
||||
PREREQ += DSPIDER_EC_SHARED
|
||||
endif
|
||||
|
||||
ifneq ($(filter feedfs-qt,$(PREREQ_BUILD)),)
|
||||
|
|
@ -1024,13 +1025,24 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VE
|
|||
PREREQ_BUILD += feedfs-utils
|
||||
PREREQ_BUILD += feedfs
|
||||
PREREQ_BUILD += ytools
|
||||
PREREQ_BUILD += feedfs-qt
|
||||
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
|
||||
|
||||
ifneq ($(filter feedfs-bz,$(PREREQ_BUILD)),)
|
||||
FEEDFS_BZ_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-bz /opt/$(FLAVOUR_PATH_PREFIX)feedfs-bz))
|
||||
FEEDFS_BZ_VERSION = $(call version,$(FEEDFS_BZ_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-bz-run = $(FEEDFS_BZ_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-bz-devel = $(FEEDFS_BZ_VERSION)
|
||||
PREREQ_BUILD += feedfs-objects
|
||||
INCLUDE += -I$(FEEDFS_BZ_DIR)/include
|
||||
LIBFLAGS += -L$(FEEDFS_BZ_DIR)/lib -lfeedfs-bz
|
||||
EXE_SEARCH_PATH += $(FEEDFS_BZ_DIR)/bin
|
||||
PREREQ += FEEDFS_BZ
|
||||
endif
|
||||
|
||||
ifneq ($(filter feedfsd,$(PREREQ_BUILD)),)
|
||||
FEEDFSD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfsd /opt/$(FLAVOUR_PATH_PREFIX)feedfsd))
|
||||
FEEDFSD_VERSION = $(call version,$(FEEDFSD_DIR))
|
||||
|
|
@ -1087,6 +1099,20 @@ EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin
|
|||
PREREQ += FEEDFS_NET
|
||||
endif
|
||||
|
||||
ifneq ($(filter feedfs-ini,$(PREREQ_BUILD)),)
|
||||
FEEDFS_INI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-ini /opt/$(FLAVOUR_PATH_PREFIX)feedfs-ini))
|
||||
FEEDFS_INI_VERSION = $(call version,$(FEEDFS_INI_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ini-run = $(FEEDFS_INI_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ini-devel = $(FEEDFS_INI_VERSION)
|
||||
PREREQ_BUILD += feedfs-objects
|
||||
PREREQ_BUILD += feedfs-utils
|
||||
PREREQ_BUILD += ytools
|
||||
INCLUDE += -I$(FEEDFS_INI_DIR)/include
|
||||
LIBFLAGS += -L$(FEEDFS_INI_DIR)/lib -lfeedfs-ini
|
||||
EXE_SEARCH_PATH += $(FEEDFS_INI_DIR)/bin
|
||||
PREREQ += FEEDFS_INI
|
||||
endif
|
||||
|
||||
ifneq ($(filter feedfs-local,$(PREREQ_BUILD)),)
|
||||
FEEDFS_LOCAL_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-local /opt/$(FLAVOUR_PATH_PREFIX)feedfs-local))
|
||||
FEEDFS_LOCAL_VERSION = $(call version,$(FEEDFS_LOCAL_DIR))
|
||||
|
|
@ -1253,6 +1279,44 @@ EXE_SEARCH_PATH += $(ALSART_DIR)/bin
|
|||
PREREQ += ALSART
|
||||
endif
|
||||
|
||||
ifneq ($(filter jackmix,$(PREREQ_BUILD)),)
|
||||
JACKMIX_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-plugins/jackmix /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackmix))
|
||||
JACKMIX_VERSION = $(call version,$(JACKMIX_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackmix-run = $(JACKMIX_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackmix-devel = $(JACKMIX_VERSION)
|
||||
PREREQ_BUILD += ytools btools
|
||||
INCLUDE += -I$(JACKMIX_DIR)/include
|
||||
LIBFLAGS += -L$(JACKMIX_DIR)/lib -ldspider-jackmix
|
||||
LD_LIB_PATH += $(JACKMIX_DIR)/dsplib
|
||||
EXE_SEARCH_PATH += $(JACKMIX_DIR)/bin
|
||||
PREREQ += JACKMIX
|
||||
endif
|
||||
|
||||
ifneq ($(filter scmjm,$(PREREQ_BUILD)),)
|
||||
SCMJM_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-plugins/scmjm /opt/$(FLAVOUR_PATH_PREFIX)dspider/scmjm))
|
||||
SCMJM_VERSION = $(call version,$(SCMJM_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scmjm-run = $(SCMJM_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scmjm-devel = $(SCMJM_VERSION)
|
||||
PREREQ_BUILD += ytools
|
||||
INCLUDE += -I$(SCMJM_DIR)/include
|
||||
LIBFLAGS += -L$(SCMJM_DIR)/lib -ldspider-scmjm
|
||||
LD_LIB_PATH += $(SCMJM_DIR)/dsplib
|
||||
EXE_SEARCH_PATH += $(SCMJM_DIR)/bin
|
||||
PREREQ += SCMJM
|
||||
endif
|
||||
|
||||
ifneq ($(filter scm,$(PREREQ_BUILD)),)
|
||||
SCM_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-plugins/scm /opt/$(FLAVOUR_PATH_PREFIX)dspider/scm))
|
||||
SCM_VERSION = $(call version,$(SCM_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scm-run = $(SCM_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scm-devel = $(SCM_VERSION)
|
||||
PREREQ_BUILD += ytools
|
||||
INCLUDE += -I$(SCM_DIR)/include
|
||||
LIBFLAGS += -L$(SCM_DIR)/lib -ldspider-scm
|
||||
EXE_SEARCH_PATH += $(SCM_DIR)/bin
|
||||
PREREQ += SCM
|
||||
endif
|
||||
|
||||
ifneq ($(filter dspfs,$(PREREQ_BUILD)),)
|
||||
DSPFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/$(FLAVOUR_PATH_PREFIX)dspfs))
|
||||
DSPFS_VERSION = $(call version,$(DSPFS_DIR))
|
||||
|
|
@ -1369,8 +1433,12 @@ LIBFLAGS += -L$(SCOPE_CASMIX_DIR)/lib -lscope-casmix
|
|||
EXE_SEARCH_PATH += $(SCOPE_CASMIX_DIR)/bin
|
||||
endif
|
||||
|
||||
PREREQ_INSTALL ?= $(PREREQ_BUILD)
|
||||
PREREQ_RUN ?= $(PREREQ_INSTALL)
|
||||
#PREREQ_INSTALL ?= $(PREREQ_BUILD)
|
||||
#PREREQ_RUN ?= $(PREREQ_INSTALL)
|
||||
|
||||
# TODO: remove this
|
||||
PREREQ_BUILD += $(PREREQ_RUN)
|
||||
PREREQ_BUILD += $(PREREQ_INSTALL)
|
||||
|
||||
ifeq ($(USE_SNDFILE),true)
|
||||
LIBFLAGS += -lsndfile
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue