packages/qt4/qt_packaging.inc: All Qt modules are roughly similar, have one python...

diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc
index eb361dd..7d39591 100644 (file)
--- a/packages/qt4/qt_packaging.inc
+++ b/packages/qt4/qt_packaging.inc
@@ -60,48 +60,55 @@ RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
 RDEPENDS_${PN}-dev = "${DEV_PACKAGES}"
 RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}"
 
+def qt_default_dev(name):
+    return """${libdir}/lib${QT_LIBRARY_NAME}%(name)s.la 
+              ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.prl
+              ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.so
+              ${includedir}/${QT_DIR_NAME}/Qt%(name)s*
+              ${libdir}/pkgconfig/${QT_LIBRARY_NAME}%(name)s.pc""" % locals()
+
 
 FILES_${QT_BASE_LIB}core4                   = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*"
-FILES_${QT_BASE_LIB}core4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}Core.la ${libdir}/lib${QT_LIBRARY_NAME}Core.prl ${libdir}/lib${QT_LIBRARY_NAME}Core.so ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc"
+FILES_${QT_BASE_LIB}core4-dev               = "${@qt_default_dev('Core')}"
 FILES_${QT_BASE_LIB}core4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*"
 FILES_${QT_BASE_LIB}gui4                    = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*"
-FILES_${QT_BASE_LIB}gui4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Gui.la ${libdir}/lib${QT_LIBRARY_NAME}Gui.prl ${libdir}/lib${QT_LIBRARY_NAME}Gui.so ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc"
+FILES_${QT_BASE_LIB}gui4-dev                = "${@qt_default_dev('Gui')}"
 FILES_${QT_BASE_LIB}gui4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*"
 FILES_${QT_BASE_LIB}network4                = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*"
-FILES_${QT_BASE_LIB}network4-dev            = "${libdir}/lib${QT_LIBRARY_NAME}Network.la ${libdir}/lib${QT_LIBRARY_NAME}Network.prl ${libdir}/lib${QT_LIBRARY_NAME}Network.so ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc"
+FILES_${QT_BASE_LIB}network4-dev            = "${@qt_default_dev('Network')}"
 FILES_${QT_BASE_LIB}network4-dbg            = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*"
 FILES_${QT_BASE_LIB}sql4                    = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*"
-FILES_${QT_BASE_LIB}sql4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Sql.la ${libdir}/lib${QT_LIBRARY_NAME}Sql.prl ${libdir}/lib${QT_LIBRARY_NAME}Sql.so ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc"
+FILES_${QT_BASE_LIB}sql4-dev                = "${@qt_default_dev('Sql')}"
 FILES_${QT_BASE_LIB}sql4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*"
 FILES_${QT_BASE_LIB}svg4                    = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*"
-FILES_${QT_BASE_LIB}svg4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Svg.la ${libdir}/lib${QT_LIBRARY_NAME}Svg.prl ${libdir}/lib${QT_LIBRARY_NAME}Svg.so ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc"
+FILES_${QT_BASE_LIB}svg4-dev                = "${@qt_default_dev('Svg')}"
 FILES_${QT_BASE_LIB}svg4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*"
 FILES_${QT_BASE_LIB}test4                   = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*"
-FILES_${QT_BASE_LIB}test4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}Test.la ${libdir}/lib${QT_LIBRARY_NAME}Test.prl ${libdir}/lib${QT_LIBRARY_NAME}Test.so ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc"
+FILES_${QT_BASE_LIB}test4-dev               = "${@qt_default_dev('Test')}"
 FILES_${QT_BASE_LIB}test4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*"
 FILES_${QT_BASE_LIB}xml4                    = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*"
-FILES_${QT_BASE_LIB}xml4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Xml.la ${libdir}/lib${QT_LIBRARY_NAME}Xml.prl ${libdir}/lib${QT_LIBRARY_NAME}Xml.so ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc"
+FILES_${QT_BASE_LIB}xml4-dev                = "${@qt_default_dev('Xml')}"
 FILES_${QT_BASE_LIB}xml4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*"
 FILES_${QT_BASE_LIB}designer4               = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*"
-FILES_${QT_BASE_LIB}designer4-dev           = "${libdir}/lib${QT_LIBRARY_NAME}Designer.la ${libdir}/lib${QT_LIBRARY_NAME}Designer.prl ${libdir}/lib${QT_LIBRARY_NAME}Designer.so ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc"
+FILES_${QT_BASE_LIB}designer4-dev           = "${@qt_default_dev('Designer')}"
 FILES_${QT_BASE_LIB}designer4-dbg           = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*"
 FILES_${QT_BASE_LIB}designercomponents4     = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*"
-FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.la ${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.prl ${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so"
+FILES_${QT_BASE_LIB}designercomponents4-dev = "${@qt_default_dev('DesignerComponents')}"
 FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*"
 FILES_${QT_BASE_LIB}3support4               = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*"
-FILES_${QT_BASE_LIB}3support4-dev           = "${libdir}/lib${QT_LIBRARY_NAME}3Support.la ${libdir}/lib${QT_LIBRARY_NAME}3Support.prl ${libdir}/lib${QT_LIBRARY_NAME}3Support.so ${includedir}/${QT_DIR_NAME}/Qt3Support*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc"
+FILES_${QT_BASE_LIB}3support4-dev           = "${@qt_default_dev('3Support')}"
 FILES_${QT_BASE_LIB}3support4-dbg           = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*"
 FILES_${QT_BASE_LIB}assistantclient4        = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*"
-FILES_${QT_BASE_LIB}assistantclient4-dev    = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.la ${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.prl ${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so ${includedir}/${QT_DIR_NAME}/QtAssistant*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc"
+FILES_${QT_BASE_LIB}assistantclient4-dev    = "${@qt_default_dev('AssistantClient')} ${includedir}/${QT_DIR_NAME}/QtAssistant*"
 FILES_${QT_BASE_LIB}assistantclient4-dbg    = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*"
 FILES_${QT_BASE_LIB}script4                 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*"
-FILES_${QT_BASE_LIB}script4-dev             = "${libdir}/lib${QT_LIBRARY_NAME}Script.la ${libdir}/lib${QT_LIBRARY_NAME}Script.prl ${libdir}/lib${QT_LIBRARY_NAME}Script.so ${includedir}/${QT_DIR_NAME}/QtScript*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc"
+FILES_${QT_BASE_LIB}script4-dev             = "${@qt_default_dev('Script')}"
 FILES_${QT_BASE_LIB}script4-dbg             = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*"
 FILES_${QT_BASE_LIB}dbus4                   = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*"
-FILES_${QT_BASE_LIB}dbus4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}DBus.la ${libdir}/lib${QT_LIBRARY_NAME}DBus.prl ${libdir}/lib${QT_LIBRARY_NAME}DBus.so ${includedir}/${QT_DIR_NAME}/QtDBus*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc"
+FILES_${QT_BASE_LIB}dbus4-dev               = "${@qt_default_dev('DBus')}"
 FILES_${QT_BASE_LIB}dbus4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*"
 FILES_${QT_BASE_LIB}opengl4                 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*"
-FILES_${QT_BASE_LIB}opengl4-dev             = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.la ${libdir}/lib${QT_LIBRARY_NAME}OpenGL.prl ${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc"
+FILES_${QT_BASE_LIB}opengl4-dev             = "${@qt_default_dev('OpenGL')}"
 FILES_${QT_BASE_LIB}opengl4-dbg             = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*"
 FILES_${QT_BASE_LIB}uitools4-dev            = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc"