diff --git a/make/defs.mk b/make/defs.mk index 9e8771f5..6d106c24 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -805,6 +805,19 @@ LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared EXE_SEARCH_PATH += $(DSPIDER_SHARED_DIR)/bin 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)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-qt-run = $(FEEDFS_QT_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-qt-devel = $(FEEDFS_QT_VERSION) +USE_FEEDFS_UTILS = true +USE_FEEDFS = true +USE_YTOOLS = true +INCLUDE += -I$(FEEDFS_QT_DIR)/include +LIBFLAGS += -L$(FEEDFS_QT_DIR)/lib -lfeedfs-qt +EXE_SEARCH_PATH += $(FEEDFS_QT_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_VERSION = $(call version,$(FEEDFS_GUI_DIR)) @@ -813,6 +826,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VE USE_FEEDFS_UTILS = true USE_FEEDFS = true USE_YTOOLS = true +USE_FEEDFS_QT = true INCLUDE += -I$(FEEDFS_GUI_DIR)/include LIBFLAGS += -L$(FEEDFS_GUI_DIR)/lib -lfeedfs-gui EXE_SEARCH_PATH += $(FEEDFS_GUI_DIR)/bin