diff --git a/make/defs.mk b/make/defs.mk index 609f6a0b..16045482 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -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_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION) PREREQ_BUILD += feedfs-utils -PREREQ_BUILD += feedfs -PREREQ_BUILD += ytools +PREREQ_BUILD += feedfs-objects INCLUDE += -I$(FEEDFS_GUI_DIR)/include LIBFLAGS += -L$(FEEDFS_GUI_DIR)/lib -lfeedfs-gui EXE_SEARCH_PATH += $(FEEDFS_GUI_DIR)/bin @@ -1212,6 +1211,19 @@ EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin PREREQ += FEEDFS_NET 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)),) FEEDFS_CIRCUIT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-circuit /opt/$(FLAVOUR_PATH_PREFIX)feedfs-circuit)) FEEDFS_CIRCUIT_VERSION = $(call version,$(FEEDFS_CIRCUIT_DIR))