change how plugininfo.h is generated

guh-plugins.pro

@@ -39,9 +39,14 @@ CONFIG+=all
 message(============================================)
 message("Qt version:" $$[QT_VERSION])
 
+plugininfo.depends = FORCE
+for (entry, PLUGIN_DIRS):plugininfo.commands += test -d $${entry} || mkdir -p $${entry}; cd $${entry} && qmake -o Makefile $$PWD/$${entry}/$${entry}.pro && cd ..;
+for (entry, PLUGIN_DIRS):plugininfo.commands += make -C $${entry} plugininfo;
+QMAKE_EXTRA_TARGETS += plugininfo
+
 # Translations:
 # make lupdate to update .ts files
-lupdate.depends = FORCE
+lupdate.depends = FORCE plugininfo
 for (entry, PLUGIN_DIRS):lupdate.commands += make -C $${entry} lupdate;
 QMAKE_EXTRA_TARGETS += lupdate
 

plugins.pri

@@ -19,30 +19,11 @@ snappy{
 }
 
 # Create plugininfo file
-JSONFILES = deviceplugin"$$TARGET".json
-plugininfo.target = plugininfo.h
-plugininfo.output = plugininfo.h
-plugininfo.CONFIG = no_link
-plugininfo.input = JSONFILES
-plugininfo.commands = touch ${QMAKE_FILE_OUT}; guh-generateplugininfo \
-                            --filetype i \
-                            --jsonfile ${QMAKE_FILE_NAME} \
-                            --output ${QMAKE_FILE_OUT} \
-                            --builddir $$OUT_PWD;
-PRE_TARGETDEPS += compiler_plugininfo_make_all
-QMAKE_EXTRA_COMPILERS += plugininfo
-
-externplugininfo.target = extern-plugininfo.h
-externplugininfo.output = extern-plugininfo.h
-externplugininfo.CONFIG = no_link
-externplugininfo.input = JSONFILES
-externplugininfo.commands = touch ${QMAKE_FILE_OUT}; guh-generateplugininfo \
-                            --filetype e \
-                            --jsonfile ${QMAKE_FILE_NAME} \
-                            --output ${QMAKE_FILE_OUT} \
-                            --builddir $$OUT_PWD;
-PRE_TARGETDEPS += compiler_externplugininfo_make_all
-QMAKE_EXTRA_COMPILERS += externplugininfo
+plugininfo.commands = guh-generateplugininfo --filetype i --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output plugininfo.h --builddir $$OUT_PWD; \
+                      guh-generateplugininfo --filetype e --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output extern-plugininfo.h --builddir $$OUT_PWD;
+plugininfo.depends = FORCE
+QMAKE_EXTRA_TARGETS += plugininfo
+PRE_TARGETDEPS += plugininfo
 
 # Install translation files
 TRANSLATIONS *= $$files($${PWD}/$${TARGET}/translations/*ts, true)
@@ -56,5 +37,6 @@ translations.files = $$[QT_SOURCE_TREE]/translations/*.qm
 
 # Install plugin
 target.path = $$PLUGIN_PATH
+target.depends += plugininfo
 INSTALLS += target translations