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

defs.mk: Add feedfs-parport to PREREQ_BUILD

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-10-30 19:31:39 +00:00
commit 052442c8f8
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/defs.mk
View file

@ -1136,8 +1136,7 @@ FEEDFS_GUI_VERSION = $(call version,$(FEEDFS_GUI_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-gui-run = $(FEEDFS_GUI_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-gui-run = $(FEEDFS_GUI_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION)
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += ytools
INCLUDE += -I$(FEEDFS_GUI_DIR)/include INCLUDE += -I$(FEEDFS_GUI_DIR)/include
LIBFLAGS += -L$(FEEDFS_GUI_DIR)/lib -lfeedfs-gui LIBFLAGS += -L$(FEEDFS_GUI_DIR)/lib -lfeedfs-gui
EXE_SEARCH_PATH += $(FEEDFS_GUI_DIR)/bin EXE_SEARCH_PATH += $(FEEDFS_GUI_DIR)/bin
@ -1212,6 +1211,19 @@ EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin
PREREQ += FEEDFS_NET PREREQ += FEEDFS_NET
endif endif
ifneq ($(filter feedfs-parport,$(PREREQ_BUILD)),)
FEEDFS_PARPORT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-parport /opt/$(FLAVOUR_PATH_PREFIX)feedfs-parport))
FEEDFS_PARPORT_VERSION = $(call version,$(FEEDFS_PARPORT_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-parport-run = $(FEEDFS_PARPORT_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-parport-devel = $(FEEDFS_PARPORT_VERSION)
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += ytools
INCLUDE += -I$(FEEDFS_PARPORT_DIR)/include
LIBFLAGS += -L$(FEEDFS_PARPORT_DIR)/lib -lfeedfs-parport
EXE_SEARCH_PATH += $(FEEDFS_PARPORT_DIR)/bin
PREREQ += FEEDFS_PARPORT
endif
ifneq ($(filter feedfs-circuit,$(PREREQ_BUILD)),) ifneq ($(filter feedfs-circuit,$(PREREQ_BUILD)),)
FEEDFS_CIRCUIT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-circuit /opt/$(FLAVOUR_PATH_PREFIX)feedfs-circuit)) FEEDFS_CIRCUIT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-circuit /opt/$(FLAVOUR_PATH_PREFIX)feedfs-circuit))
FEEDFS_CIRCUIT_VERSION = $(call version,$(FEEDFS_CIRCUIT_DIR)) FEEDFS_CIRCUIT_VERSION = $(call version,$(FEEDFS_CIRCUIT_DIR))