Removed binary-pass and converted to link-pseudo-pass - it doesn't work

[omk.git] / snippets / qt

diff --git a/snippets/qt b/snippets/qt
index 7091df6ddc38a56d9aff7b2c7f660f207cec05c3..c09b28afcee9bb373191081bf9696e436866418c 100644 (file)
--- a/snippets/qt
+++ b/snippets/qt
@@ -8,7 +8,7 @@ ifneq ($(QT_SUBDIRS),)
 # Usage: $(call qt_makefile_template,<qt-subdir>)
 define qt_makefile_template
 $(SOURCES_DIR)/$(1)/Makefile: $(wildcard $(SOURCES_DIR)/$(1)/*.pro)
-       cd $(SOURCES_DIR)/$(1); $(QTDIR:%=%/bin/)qmake TOP_DIR=$(MAKERULES_DIR) \
+       cd $(SOURCES_DIR)/$(1); $(QTDIR:%=%/bin/)qmake TOP_DIR=$(OUTPUT_DIR) \
             RELATIVE_DIR=$(RELATIVE_PREFIX)$(1) $(QTDIR:%=QTDIR=%) CC=$(CC) \
             CXX=$(CXX) LIBS+="-L$(USER_LIB_DIR)" INCLUDEPATH+="$(USER_INCLUDE_DIR)"
 endef
@@ -21,7 +21,7 @@ qt-subpass: $(foreach dir,$(QT_SUBDIRS), $(SOURCES_DIR)/$(dir)/Makefile)
                -f $(SOURCES_DIR)/$(dir)/Makefile || exit 1 ;)
 
 # Hook to binary pass
-binary-pass: qt-subpass
+binary-pass-submakes: qt-subpass
 
 # Hook to clean pass
 clean-local: clean-qt