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

CHANGES, defs.mk, rules.mk: Joined V_1_2_3_20_CASAS_NOVAS

Browse source
This commit is contained in:
Jan Lindemann 2012-03-20 15:38:46 +00:00 • committed by Jan Lindemann
commit 13efb58775
3 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -413,3 +413,4 @@ o merged changes from V_1_2_1_7_NEUHAUS
Version 1.2.3
-------------
o changed interfaces of YVariant and YStringTree
o joined V_1_2_3_20_CASAS_NOVAS

34
make/defs.mk
View file

@ -878,7 +878,21 @@ USE_DSPIDER_SHARED = true
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_DSPCD_EC),true)
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))
# include $(DSPCD_DIR)/make/public.mk
DSPIDER_DSPCD_VERSION = $(call version,$(DSPCD_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)
USE_YTOOLS = true
USE_DSPIDER_SHARED_EC = true
USE_USERVER = true
INCLUDE += -I$(DSPCD_DIR)/include
LIBFLAGS += -L$(DSPCD_EXE_PREFIX)/lib -ldspcd-ec
PREREQ += DSPCD
endif
@ -911,6 +925,20 @@ EXE_SEARCH_PATH += $(DSPIDER_SHARED_DIR)/bin
PREREQ += DSPIDER_SHARED
endif
ifeq ($(USE_DSPIDER_SHARED_EC),true)
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))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-ec-run = $(DSPIDER_SHARED_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-ec-devel = $(DSPIDER_SHARED_VERSION)
USE_YTOOLS = true
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
endif
ifeq ($(USE_FEEDFS_QT),true)
FEEDFS_QT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-qt /opt/$(FLAVOUR_PATH_PREFIX)feedfs-qt))
FEEDFS_QT_VERSION = $(call version,$(FEEDFS_QT_DIR))
@ -1157,8 +1185,8 @@ endif
ifeq ($(USE_JACKDUMMY),true)
JACKDUMMY_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackdummy /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackdummy))
JACKDUMMY_VERSION = $(call version,$(JACKDUMMY_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackdummy-run = $(JACKDUMMY_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackdummy-devel = $(JACKDUMMY_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackdummy-run = $(JACKDUMMY_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackdummy-devel = $(JACKDUMMY_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(JACKDUMMY_DIR)/include
LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy

8
make/rules.mk
View file

@ -25,7 +25,7 @@ checkroot:
installexe: all checkroot $(INSTALLED_EXE)
installso: all checkroot $(INSTALL_LIBDIR) $(INSTALLED_SHOBJS)
installso: all checkroot install_dir_LIB $(INSTALLED_SHOBJS)
installsh: all checkroot $(INSTALL_EXEDIR) $(INSTALLED_EXE_SH)
@ -340,12 +340,10 @@ $$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done
fi
$$(TOPDIR)/dir_install_$(1).done:
$$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR)
touch $$@
$$(INSTALL_$(1)DIR):
$$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$@
$$(INSTALL_$(1)DIR)/%: % | $$(INSTALL_$(1)DIR)
$$(INSTALL_$(1)DIR)/%: % | $$(TOPDIR)/dir_install_$(1).done
$$(INSTALL) -o $$($(1)OWNER) -g $$($(1)GROUP) -m $$($(1)MODE) $$< $$@
endef