diff --git a/make/defs.mk b/make/defs.mk
index 0f648411..5ef7b3f9 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -649,7 +649,7 @@ ifeq ($(USE_PROJECT_LIB),true)
 	PROJECTLIB_LDFLAGS    += -l$(LIBNAME)
 endif
 
-ifeq ($(USE_YTOOLS),true)
+ifneq ($(filter ytools,$(PREREQ_BUILD)),)
 	ifeq ($(TARGET),mingw)
 	YTOOLS_LDFLAGS        += -lglib-2.0 -lws2_32 -lstdc++
 	endif
@@ -809,94 +809,94 @@ endif
 
 # -- use of supplementary libraries
 
-ifeq ($(USE_JUX2),true)
+ifneq ($(filter jux2,$(PREREQ_BUILD)),)
 JUX2_DIR                   = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux2 /opt/$(FLAVOUR_PATH_PREFIX)jux2))
 JUX2_VERSION               = $(call version,$(JUX2_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)jux2-run = $(JUX2_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)jux2-devel = $(JUX2_VERSION)
-USE_YTOOLS                 = true
-USE_FEEDFS                 = true
-USE_FEEDFS_OBJECTS         = true
-USE_FEEDFS_UTILS           = true
-USE_BTOOLS                 = true
-USE_JUX                    = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += feedfs-objects
+PREREQ_BUILD              += feedfs-utils
+PREREQ_BUILD              += btools
+PREREQ_BUILD              += jux
 INCLUDE                   += -I$(JUX2_DIR)/include
 LIBFLAGS                  += -L$(JUX2_DIR)/lib -ljux2
 EXE_SEARCH_PATH           += $(JUX2_DIR)/bin
 PREREQ                    += JUX2
 endif
 
-ifeq ($(USE_JUX),true)
+ifneq ($(filter jux,$(PREREQ_BUILD)),)
 JUX_DIR                   = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux /opt/$(FLAVOUR_PATH_PREFIX)jux))
 JUX_VERSION               = $(call version,$(JUX_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)jux-run = $(JUX_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)jux-devel = $(JUX_VERSION)
-USE_YTOOLS                 = true
-USE_FEEDFS                 = true
-USE_FEEDFS_OBJECTS         = true
-USE_FEEDFS_UTILS           = true
-USE_FEEDFS_NET             = true
-USE_FEEDFS_LOCAL           = true
-USE_BTOOLS                 = true
-USE_JUX_SHARED             = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += feedfs-objects
+PREREQ_BUILD              += feedfs-utils
+PREREQ_BUILD              += feedfs-net
+PREREQ_BUILD              += feedfs-local
+PREREQ_BUILD              += btools
+PREREQ_BUILD              += jux-shared
 INCLUDE                   += -I$(JUX_DIR)/include
 LIBFLAGS                  += -L$(JUX_DIR)/lib -ljux
 EXE_SEARCH_PATH           += $(JUX_DIR)/bin
 PREREQ                    += JUX
 endif
 
-ifeq ($(USE_JUX_CLIENT_JAVA),true)
+ifneq ($(filter jux-client-java,$(PREREQ_BUILD)),)
 JUX_CLIENT_JAVA_DIR        = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-client-java /opt/$(FLAVOUR_PATH_PREFIX)jux-client-java))
 JUX_CLIENT_JAVA_VERSION    = $(call version,$(JUX_CLIENT_JAVA_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)jux-client-java-run = $(JUX_CLIENT_JAVA_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)jux-client-java-devel = $(JUX_CLIENT_JAVA_VERSION)
-USE_JUX_CLIENT             = true
+PREREQ_BUILD              += jux-client
 LIBFLAGS                  += -L$(JUX_CLIENT_JAVA_DIR)/lib -ljux-client-java
 PREREQ                    += JUX_CLIENT_JAVA
 endif
 
-ifeq ($(USE_JUX_CLIENT),true)
+ifneq ($(filter jux-client,$(PREREQ_BUILD)),)
 JUX_CLIENT_DIR             = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-client /opt/$(FLAVOUR_PATH_PREFIX)jux-client))
 JUX_CLIENT_VERSION         = $(call version,$(JUX_CLIENT_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)jux-client-run = $(JUX_CLIENT_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)jux-client-devel = $(JUX_CLIENT_VERSION)
-USE_FEEDFS_NET             = true
-USE_JUX_SHARED             = true
+PREREQ_BUILD              += feedfs-net
+PREREQ_BUILD              += jux-shared
 INCLUDE                   += -I$(JUX_CLIENT_DIR)/include
 LIBFLAGS                  += -L$(JUX_CLIENT_DIR)/lib -ljux-client
 EXE_SEARCH_PATH           += $(JUX_CLIENT_DIR)/bin
 PREREQ                    += JUX_CLIENT
 endif
 
-ifeq ($(USE_JUX_SHARED),true)
+ifneq ($(filter jux-shared,$(PREREQ_BUILD)),)
 JUX_SHARED_DIR             = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-shared /opt/$(FLAVOUR_PATH_PREFIX)jux-shared))
 JUX_SHARED_VERSION         = $(call version,$(JUX_SHARED_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)jux-shared-run = $(JUX_SHARED_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)jux-shared-devel = $(JUX_SHARED_VERSION)
-USE_YTOOLS                 = true
-USE_FEEDFS                 = true
-USE_FEEDFS_OBJECTS         = true
-USE_FEEDFS_UTILS           = true
-USE_BTOOLS                 = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += feedfs-objects
+PREREQ_BUILD              += feedfs-utils
+PREREQ_BUILD              += btools
 INCLUDE                   += -I$(JUX_SHARED_DIR)/include
 LIBFLAGS                  += -L$(JUX_SHARED_DIR)/lib -ljux-shared
 PREREQ                    += JUX_SHARED
 endif
 
-ifeq ($(USE_CCASFS),true)
+ifneq ($(filter ccasfs,$(PREREQ_BUILD)),)
 CCASFS_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/ccasfs /opt/$(FLAVOUR_PATH_PREFIX)dspider/ccasfs))
 CCASFS_VERSION             = $(call version,$(CCASFS_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION)
-USE_YTOOLS                 = true
-USE_CCONSOLE               = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += cconsole
 INCLUDE                   += -I$(CCASFS_DIR)/include
 #LIBFLAGS                  += -L$(CCONSOLE_DIR)/lib -lcconsole
 EXE_SEARCH_PATH           += $(CCASFS_DIR)/bin
 PREREQ                    += CCASFS
 endif
 
-ifeq ($(USE_CCONSOLE),true)
+ifneq ($(filter cconsole,$(PREREQ_BUILD)),)
 CCONSOLE_DIR               = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/$(FLAVOUR_PATH_PREFIX)dspider/cconsole))
 CCONSOLE_VERSION           = $(call version,$(CCONSOLE_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION)
@@ -913,198 +913,198 @@ EXE_SEARCH_PATH           += $(CCONSOLE_DIR)/bin
 PREREQ                    += CCONSOLE
 endif
 
-ifeq ($(USE_DSPCD),true)
+ifneq ($(filter dspcd,$(PREREQ_BUILD)),)
 DSPCD_DIR                  = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider/dspcd))
 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-run = $(DSPIDER_DSPCD_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)dspider-dspcd-devel = $(DSPIDER_DSPCD_VERSION)
-USE_YTOOLS                 = true
-USE_DSPIDER_SHARED         = true
-USE_USERVER                = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += dspider-shared
+PREREQ_BUILD              += userver
 INCLUDE                   += -I$(DSPCD_DIR)/include
 LIBFLAGS                  += -L$(DSPCD_EXE_PREFIX)/lib -ldspcd
 PREREQ                    += DSPCD
 endif
 
-ifeq ($(USE_DSPCD_EC),true)
+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))
 # 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
+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
 endif
 
-ifeq ($(USE_DSPROUT),true)
+ifneq ($(filter dsprout,$(PREREQ_BUILD)),)
 DSPROUT_DIR                = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/dspider/$(FLAVOUR_PATH_PREFIX)dsprout))
 DSPROUT_EXE_PREFIX         = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/$(FLAVOUR_PATH_PREFIX)dspider))
 DSPROUT_VERSION            = $(call version,$(DSPROUT_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION)
-USE_YTOOLS                 = true
-USE_DSPIDER_SHARED         = true
-USE_USERVER                = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += dspider-shared
+PREREQ_BUILD              += userver
 INCLUDE                   += -I$(DSPROUT_DIR)/include
 LIBFLAGS                  += -L$(DSPROUT_EXE_PREFIX)/lib -ldsprout
 EXE_SEARCH_PATH           += $(DSPROUT_DIR)/bin
 PREREQ                    += DSPROUT
 endif
 
-ifeq ($(USE_DSPIDER_SHARED),true)
+ifneq ($(filter dspider-shared,$(PREREQ_BUILD)),)
 DSPIDER_SHARED_DIR         = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider/shared))
 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-run = $(DSPIDER_SHARED_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)dspider-shared-devel = $(DSPIDER_SHARED_VERSION)
-USE_YTOOLS                 = true
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(DSPIDER_SHARED_DIR)/include
 LIBFLAGS                  += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared
 EXE_SEARCH_PATH           += $(DSPIDER_SHARED_DIR)/bin
 PREREQ                    += DSPIDER_SHARED
 endif
 
-ifeq ($(USE_DSPIDER_SHARED_EC),true)
+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))
 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
+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
 endif
 
-ifeq ($(USE_FEEDFS_QT),true)
+ifneq ($(filter feedfs-qt,$(PREREQ_BUILD)),)
 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
+PREREQ_BUILD              += feedfs-utils
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(FEEDFS_QT_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_QT_DIR)/lib -lfeedfs-qt
 EXE_SEARCH_PATH           += $(FEEDFS_QT_DIR)/bin
 PREREQ                    += FEEDFS_QT
 endif
 
-ifeq ($(USE_FEEDFS_WT),true)
+ifneq ($(filter feedfs-wt,$(PREREQ_BUILD)),)
 FEEDFS_WT_DIR              = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-wt /opt/$(FLAVOUR_PATH_PREFIX)feedfs-wt))
 FEEDFS_WT_VERSION          = $(call version,$(FEEDFS_WT_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-wt-run = $(FEEDFS_WT_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-wt-devel = $(FEEDFS_WT_VERSION)
-USE_FEEDFS_UTILS           = true
-USE_FEEDFS                 = true
-USE_YTOOLS                 = true
-USE_FEEDFS_GUI             = true
-USE_WT_JANNET              = true
+PREREQ_BUILD              += feedfs-utils
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += feedfs-gui
+PREREQ_BUILD              += wt-jannet
 INCLUDE                   += -I$(FEEDFS_WT_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_WT_DIR)/lib -lfeedfs-wt
 EXE_SEARCH_PATH           += $(FEEDFS_WT_DIR)/bin
 PREREQ                    += FEEDFS_WT
 endif
 
-ifeq ($(USE_FEEDFS_GUI),true)
+ifneq ($(filter feedfs-gui,$(PREREQ_BUILD)),)
 FEEDFS_GUI_DIR            ?= $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-gui /opt/$(FLAVOUR_PATH_PREFIX)feedfs-gui))
 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)
-USE_FEEDFS_UTILS           = true
-USE_FEEDFS                 = true
-USE_YTOOLS                 = true
-USE_FEEDFS_QT              = true
+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
 
-ifeq ($(USE_FEEDFSD),true)
+ifneq ($(filter feedfsd,$(PREREQ_BUILD)),)
 FEEDFSD_DIR                = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfsd /opt/$(FLAVOUR_PATH_PREFIX)feedfsd))
 FEEDFSD_VERSION            = $(call version,$(FEEDFSD_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfsd-run = $(FEEDFSD_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfsd-devel = $(FEEDFSD_VERSION)
-USE_FEEDFS                 = true
-USE_YTOOLS                 = true
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(FEEDFSD_DIR)/include
 LIBFLAGS                  += -L$(FEEDFSD_DIR)/lib -lfeedfsd
 EXE_SEARCH_PATH           += $(FEEDFSD_DIR)/bin
 PREREQ                    += FEEDFSD
 endif
 
-ifeq ($(USE_FEEDFS_LDAP),true)
+ifneq ($(filter feedfs-ldap,$(PREREQ_BUILD)),)
 FEEDFS_LDAP_DIR            = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-ldap /opt/$(FLAVOUR_PATH_PREFIX)feedfs-ldap))
 FEEDFS_LDAP_VERSION        = $(call version,$(FEEDFS_LDAP_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-ldap-run = $(FEEDFS_LDAP_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-ldap-devel = $(FEEDFS_LDAP_VERSION)
-USE_FEEDFS                 = true
-USE_YTOOLS                 = true
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(FEEDFS_LDAP_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_LDAP_DIR)/lib -lfeedfs-ldap -lldap
 EXE_SEARCH_PATH           += $(FEEDFS_LDAP_DIR)/bin
 PREREQ                    += FEEDFS_LDAP
 endif
 
-ifeq ($(USE_FEEDFS_UTILS),true)
+ifneq ($(filter feedfs-utils,$(PREREQ_BUILD)),)
 FEEDFS_UTILS_DIR           = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-utils /opt/$(FLAVOUR_PATH_PREFIX)feedfs-utils))
 FEEDFS_UTILS_VERSION       = $(call version,$(FEEDFS_UTILS_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-utils-run = $(FEEDFS_UTILS_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-utils-devel = $(FEEDFS_UTILS_VERSION)
-USE_FEEDFS_OBJECTS         = true
-USE_FEEDFS                 = true
-USE_YTOOLS                 = true
+PREREQ_BUILD              += feedfs-objects
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(FEEDFS_UTILS_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils
 EXE_SEARCH_PATH           += $(FEEDFS_UTILS_DIR)/bin
 PREREQ                    += FEEDFS_UTILS
 endif
 
-ifeq ($(USE_FEEDFS_NET),true)
+ifneq ($(filter feedfs-net,$(PREREQ_BUILD)),)
 FEEDFS_NET_DIR             = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-net /opt/$(FLAVOUR_PATH_PREFIX)feedfs-net))
 FEEDFS_NET_VERSION         = $(call version,$(FEEDFS_NET_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-net-run = $(FEEDFS_NET_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-net-devel = $(FEEDFS_NET_VERSION)
-USE_FEEDFS_OBJECTS         = true
-USE_FEEDFS_UTILS           = true
-USE_XCHANGE                = true
-USE_FEEDFS_FMEMFS          = true
-USE_YTOOLS                 = true
+PREREQ_BUILD              += feedfs-objects
+PREREQ_BUILD              += feedfs-utils
+PREREQ_BUILD              += xchange
+PREREQ_BUILD              += feedfs-fmemfs
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(FEEDFS_NET_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
 EXE_SEARCH_PATH           += $(FEEDFS_NET_DIR)/bin
 PREREQ                    += FEEDFS_NET
 endif
 
-ifeq ($(USE_FEEDFS_LOCAL),true)
+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))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-local-run = $(FEEDFS_LOCAL_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-local-devel = $(FEEDFS_LOCAL_VERSION)
-USE_FEEDFS                 = true
+PREREQ_BUILD              += feedfs
 # no build-time linkage necessary, no headers exported
 LD_LIB_PATH               += $(FEEDFS_LOCAL_DIR)/lib
 EXE_SEARCH_PATH           += $(FEEDFS_LOCAL_DIR)/bin
 PREREQ                    += FEEDFS_LOCAL
 endif
 
-ifeq ($(USE_FEEDFS_REWRITE),true)
+ifneq ($(filter feedfs-rewrite,$(PREREQ_BUILD)),)
 FEEDFS_REWRITE_DIR         = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-rewrite /opt/$(FLAVOUR_PATH_PREFIX)feedfs-rewrite))
 FEEDFS_REWRITE_VERSION     = $(call version,$(FEEDFS_REWRITE_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-rewrite-run = $(FEEDFS_REWRITE_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-rewrite-devel = $(FEEDFS_REWRITE_VERSION)
-USE_FEEDFS                 = true
+PREREQ_BUILD              += feedfs
 # no build-time linkage necessary, no headers exported
 LD_LIB_PATH               += $(FEEDFS_REWRITE_DIR)/lib
 EXE_SEARCH_PATH           += $(FEEDFS_REWRITE_DIR)/bin
@@ -1112,12 +1112,12 @@ LIBFLAGS                  += -lboost_regex
 PREREQ                    += FEEDFS_REWRITE
 endif
 
-ifeq ($(USE_FEEDFS_FMEMFS),true)
+ifneq ($(filter feedfs-fmemfs,$(PREREQ_BUILD)),)
 FEEDFS_FMEMFS_DIR           = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-fmemfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs-fmemfs))
 FEEDFS_FMEMFS_VERSION       = $(call version,$(FEEDFS_FMEMFS_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-fmemfs-run = $(FEEDFS_FMEMFS_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-fmemfs-devel = $(FEEDFS_FMEMFS_VERSION)
-USE_FEEDFS                 = true
+PREREQ_BUILD              += feedfs
 # no build-time linkage necessary, no headers exported
 LD_LIB_PATH               += $(FEEDFS_FMEMFS_DIR)/lib
 INCLUDE                   += -I$(FEEDFS_FMEMFS_DIR)/include
@@ -1126,12 +1126,12 @@ EXE_SEARCH_PATH           += $(FEEDFS_FMEMFS_DIR)/bin
 PREREQ                    += FEEDFS_FMEMFS
 endif
 
-ifeq ($(USE_FEEDFS_SYSLOG),true)
+ifneq ($(filter feedfs-syslog,$(PREREQ_BUILD)),)
 FEEDFS_SYSLOG_DIR           = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-syslog /opt/$(FLAVOUR_PATH_PREFIX)feedfs-syslog))
 FEEDFS_SYSLOG_VERSION       = $(call version,$(FEEDFS_SYSLOG_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-syslog-run = $(FEEDFS_SYSLOG_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-syslog-devel = $(FEEDFS_SYSLOG_VERSION)
-USE_FEEDFS                 = true
+PREREQ_BUILD              += feedfs
 # no build-time linkage necessary, no headers exported
 LD_LIB_PATH               += $(FEEDFS_SYSLOG_DIR)/lib
 INCLUDE                   += -I$(FEEDFS_SYSLOG_DIR)/include
@@ -1140,150 +1140,150 @@ EXE_SEARCH_PATH           += $(FEEDFS_SYSLOG_DIR)/bin
 PREREQ                    += FEEDFS_SYSLOG
 endif
 
-ifeq ($(USE_FEEDFS_OBJECTS),true)
+ifneq ($(filter feedfs-objects,$(PREREQ_BUILD)),)
 FEEDFS_OBJECTS_DIR        ?= $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects))
 FEEDFS_OBJECTS_VERSION     = $(call version,$(FEEDFS_OBJECTS_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-objects-run = $(FEEDFS_OBJECTS_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION)
-USE_FEEDFS                 = true
-USE_YTOOLS                 = true
+PREREQ_BUILD              += feedfs
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(FEEDFS_OBJECTS_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_OBJECTS_DIR)/lib -lfeedfs-objects
 EXE_SEARCH_PATH           += $(FEEDFS_OBJECTS_DIR)/bin
 PREREQ                    += FEEDFS_OBJECTS
 endif
 
-ifeq ($(USE_FEEDFS),true)
+ifneq ($(filter feedfs,$(PREREQ_BUILD)),)
 FEEDFS_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs))
 FEEDFS_VERSION             = $(call version,$(FEEDFS_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION)
-USE_YTOOLS                 = true
-USE_VALDI                  = true
-USE_AUTH                   = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += valdi
+PREREQ_BUILD              += auth
 INCLUDE                   += -I$(FEEDFS_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_DIR)/lib -lfeedfs
 EXE_SEARCH_PATH           += $(FEEDFS_DIR)/bin
 PREREQ                    += FEEDFS
 endif
 
-ifeq ($(USE_USERVER),true)
+ifneq ($(filter userver,$(PREREQ_BUILD)),)
 USERVER_DIR                = $(firstword $(wildcard $(CVS_PROJ_DIR)/userver /opt/$(FLAVOUR_PATH_PREFIX)userver))
 USERVER_VERSION            = $(call version,$(USERVER_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION)
-USE_XCHANGE                = true
-USE_YTOOLS                 = true
+PREREQ_BUILD              += xchange
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(USERVER_DIR)/include
 LIBFLAGS                  += -L$(USERVER_DIR)/lib -luserver
 EXE_SEARCH_PATH           += $(USERVER_DIR)/bin
 PREREQ                    += USERVER
 endif
 
-ifeq ($(USE_XCHANGE),true)
+ifneq ($(filter xchange,$(PREREQ_BUILD)),)
 XCHANGE_DIR                = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt/$(FLAVOUR_PATH_PREFIX)xchange))
 XCHANGE_VERSION            = $(call version,$(XCHANGE_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION)
-USE_YTOOLS                 = true
-USE_VALDI                  = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += valdi
 INCLUDE                   += -I$(XCHANGE_DIR)/include
 LIBFLAGS                  += -L$(XCHANGE_DIR)/lib -lxchange
 EXE_SEARCH_PATH           += $(XCHANGE_DIR)/bin
 PREREQ                    += XCHANGE
 endif
 
-ifeq ($(USE_BTOOLS),true)
+ifneq ($(filter btools,$(PREREQ_BUILD)),)
 BTOOLS_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/$(FLAVOUR_PATH_PREFIX)btools))
 BTOOLS_VERSION             = $(call version,$(BTOOLS_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)dspider-btools-run = $(BTOOLS_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)dspider-btools-devel = $(BTOOLS_VERSION)
-USE_YTOOLS                 = true
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(BTOOLS_DIR)/include
 LIBFLAGS                  += -L$(BTOOLS_DIR)/lib -ldspider-btools
 EXE_SEARCH_PATH           += $(BTOOLS_DIR)/bin
 PREREQ                    += BTOOLS
 endif
 
-ifeq ($(USE_JACKJART),true)
+ifneq ($(filter jackjart,$(PREREQ_BUILD)),)
 JACKJART_DIR               = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackjart /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackjart))
 JACKJART_VERSION           = $(call version,$(JACKJART_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION)
-USE_YTOOLS                 = true
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(JACKJART_DIR)/include
 LIBFLAGS                  += -L$(JACKJART_DIR)/lib -ldspider-jackjart
 EXE_SEARCH_PATH           += $(JACKJART_DIR)/bin
 PREREQ                    += JACKJART
 endif
 
-ifeq ($(USE_JACKRTAI),true)
+ifneq ($(filter jackrtai,$(PREREQ_BUILD)),)
 JACKRTAI_DIR               = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackrtai /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackrtai))
 JACKRTAI_VERSION           = $(call version,$(JACKRTAI_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION)
-USE_YTOOLS                 = true
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(JACKRTAI_DIR)/include
 LIBFLAGS                  += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai
 EXE_SEARCH_PATH           += $(JACKRTAI_DIR)/bin
 PREREQ                    += JACKRTAI
 endif
 
-ifeq ($(USE_JACKDUMMY),true)
+ifneq ($(filter jackdummy,$(PREREQ_BUILD)),)
 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)dspider-jackdummy-run = $(JACKDUMMY_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)dspider-jackdummy-devel = $(JACKDUMMY_VERSION)
-USE_YTOOLS                 = true
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(JACKDUMMY_DIR)/include
 LIBFLAGS                  += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy
 EXE_SEARCH_PATH           += $(JACKDUMMY_DIR)/bin
 PREREQ                    += JACKDUMMY
 endif
 
-ifeq ($(USE_ALSART),true)
+ifneq ($(filter alsart,$(PREREQ_BUILD)),)
 ALSART_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/alsart /opt/$(FLAVOUR_PATH_PREFIX)dspider/alsart))
 ALSART_VERSION             = $(call version,$(ALSART_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION)
-USE_YTOOLS                 = true
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(ALSART_DIR)/include
 LIBFLAGS                  += -L$(ALSART_DIR)/lib -lalsart
 EXE_SEARCH_PATH           += $(ALSART_DIR)/bin
 PREREQ                    += ALSART
 endif
 
-ifeq ($(USE_DSPFS),true)
+ifneq ($(filter dspfs,$(PREREQ_BUILD)),)
 DSPFS_DIR                  = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/$(FLAVOUR_PATH_PREFIX)dspfs))
 DSPFS_VERSION              = $(call version,$(DSPFS_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION)
-USE_YTOOLS                 = true
+PREREQ_BUILD              += ytools
 INCLUDE                   += -I$(DSPFS_DIR)/include
 LIBFLAGS                  += -L$(DSPFS_DIR)/lib -ldspfs
 EXE_SEARCH_PATH           += $(DSPFS_DIR)/bin
 PREREQ                    += DSPFS
 endif
 
-ifeq ($(USE_AUTH),true)
+ifneq ($(filter auth,$(PREREQ_BUILD)),)
 AUTH_DIR                   = $(firstword $(wildcard $(CVS_PROJ_DIR)/auth /opt/$(FLAVOUR_PATH_PREFIX)auth))
 AUTH_VERSION               = $(call version,$(AUTH_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)auth-run = $(AUTH_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)auth-devel = $(AUTH_VERSION)
-USE_YTOOLS                 = true
-USE_VALDI                  = true
+PREREQ_BUILD              += ytools
+PREREQ_BUILD              += valdi
 INCLUDE                   += -I$(AUTH_DIR)/include
 LIBFLAGS                  += -L$(AUTH_DIR)/lib -lauth
 EXE_SEARCH_PATH           += $(AUTH_DIR)/bin
 PREREQ                    += AUTH
 endif
 
-ifeq ($(USE_VALDI),true)
+ifneq ($(filter valdi,$(PREREQ_BUILD)),)
 VALDI_DIR                   = $(firstword $(wildcard $(CVS_PROJ_DIR)/valdi /opt/$(FLAVOUR_PATH_PREFIX)valdi))
 VALDI_VERSION               = $(call version,$(VALDI_DIR))
 RPM_REQUIRES_RUN           += $(FLAVOUR_PREFIX)valdi-run = $(VALDI_VERSION)
 RPM_REQUIRES_DEVEL         += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION)
-USE_YTOOLS                  = true
+PREREQ_BUILD              += ytools
 #INCLUDE                   += -I$(VALDI_DIR)/include
 LIBFLAGS                  += -L$(VALDI_DIR)/lib
 #LIBFLAGS                  += -L$(VALDI_DIR)/lib -lvaldi
@@ -1291,14 +1291,14 @@ EXE_SEARCH_PATH           += $(VALDI_DIR)/bin
 PREREQ                    += VALDI
 endif
 
-ifeq ($(USE_WT_JANNET),true)
+ifneq ($(filter wt-jannet,$(PREREQ_BUILD)),)
 USE_WT                     = true
 include $(MODDIR)/make/wt-defs.mk
 WT_JANNET_DIR              = $(firstword $(wildcard $(CVS_PROJ_DIR)/wt-jannet /opt/$(FLAVOUR_PATH_PREFIX)wt-jannet))
 WT_JANNET_VERSION          = $(call version,$(WT_JANNET_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)wt-jannet-run = $(WT_JANNET_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)wt-jannet-devel = $(WT_JANNET_VERSION)
-USE_FEEDFS                 = true
+PREREQ_BUILD              += feedfs
 INCLUDE                   += -I$(WT_JANNET_DIR)/include
 LD_LIB_PATH               += $(WT_JANNET_DIR)/lib
 EXE_SEARCH_PATH           += $(WT_JANNET_DIR)/bin
@@ -1306,43 +1306,43 @@ PREREQ                    += WT_JANNET
 CATCH_ONLY_YERROR          = false
 endif
 
-ifeq ($(USE_APACHE2_JANNET),true)
+ifneq ($(filter apache2-jannet,$(PREREQ_BUILD)),)
 APACHE2_JANNET_DIR         = $(firstword $(wildcard $(CVS_PROJ_DIR)/apache2-jannet /opt/$(FLAVOUR_PATH_PREFIX)apache2-jannet))
 APACHE2_JANNET_VERSION     = $(call version,$(APACHE2_JANNET_DIR))
 RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)apache2-jannet-run = $(APACHE2_JANNET_VERSION)
 RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)apache2-jannet-devel = $(APACHE2_JANNET_VERSION)
-USE_FEEDFS                 = true
+PREREQ_BUILD              += feedfs
 # no build-time linkage necessary, no headers exported
 LD_LIB_PATH               += $(APACHE2_JANNET_DIR)/lib
 EXE_SEARCH_PATH           += $(APACHE2_JANNET_DIR)/bin
 PREREQ                    += APACHE2_JANNET
 endif
 
-ifeq ($(USE_FPTEST),true)
+ifneq ($(filter fptest,$(PREREQ_BUILD)),)
 FPTEST_DIR                  = $(firstword $(wildcard $(CVS_PROJ_DIR)/fptest /opt/$(FLAVOUR_PATH_PREFIX)fptest))
 FPTEST_VERSION              = $(call version,$(FPTEST_DIR))
 RPM_REQUIRES_RUN           += $(FLAVOUR_PREFIX)fptest-run = $(FPTEST_VERSION)
 RPM_REQUIRES_DEVEL         += $(FLAVOUR_PREFIX)fptest-devel = $(FPTEST_VERSION)
-USE_YTOOLS                  = true
+PREREQ_BUILD              += ytools
 INCLUDE                    += -I$(FPTEST_DIR)/include
 LIBFLAGS                   += -L$(FPTEST_DIR)/lib -lfptest -L$(HOME)/opt/iowkit/lib -liowkit
 EXE_SEARCH_PATH            += $(FPTEST_DIR)/bin
 PREREQ                    += FPTEST
 endif
 
-ifeq ($(USE_FPANEL),true)
+ifneq ($(filter fpanel,$(PREREQ_BUILD)),)
 FPANEL_DIR                  = $(firstword $(wildcard $(CVS_PROJ_DIR)/fpanel /opt/$(FLAVOUR_PATH_PREFIX)fpanel))
 FPANEL_VERSION              = $(call version,$(FPANEL_DIR))
 RPM_REQUIRES_RUN           += $(FLAVOUR_PREFIX)fpanel-run = $(FPANEL_VERSION)
 RPM_REQUIRES_DEVEL         += $(FLAVOUR_PREFIX)fpanel-devel = $(FPANEL_VERSION)
-USE_YTOOLS                  = true
+PREREQ_BUILD              += ytools
 INCLUDE                    += -I$(FPANEL_DIR)/include
 LIBFLAGS                   += -L$(FPANEL_DIR)/lib -lfpanel -L$(HOME)/opt/iowkit/lib -liowkit
 EXE_SEARCH_PATH            += $(FPANEL_DIR)/bin
 PREREQ                    += FPANEL
 endif
 
-ifeq ($(USE_YTOOLS),true)
+ifneq ($(filter ytools,$(PREREQ_BUILD)),)
 ifneq ($(PROJECT),ytools)
 YTOOLS_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools))
 else
diff --git a/make/proj.mk b/make/proj.mk
index 41758660..575c39c2 100644
--- a/make/proj.mk
+++ b/make/proj.mk
@@ -49,7 +49,7 @@ else
 	include $(TOPDIR)/make/cfg_dist.mk
 endif
 
-USE_YTOOLS        = true
+PREREQ_BUILD     += ytools
 USE_GLIB          = true
 
 CFLAGS           += -D_USRDLL -DYTOOLS_EXPORTS