[dia] docs: update gtk-doc build

From: Zander <zbrown src gnome org>
To: commits-list gnome org
Cc:
Subject: [dia] docs: update gtk-doc build
Date: Fri, 27 Sep 2019 12:01:08 +0000 (UTC)
commit a2a17ed9902f24ac9443dbebafa120e816cd508c
Author: Zander Brown <zbrown gnome org>
Date:   Fri Sep 27 13:00:34 2019 +0100

    docs: update gtk-doc build
    
    Build lib and app seperatly, unfortunatly doesn't link them together

 app/meson.build                              |  31 +++++---
 docs/dia-app/dia-app-docs.xml                | 109 +++++++++++++++++++++++++++
 docs/dia-app/meson.build                     |  40 ++++++++++
 docs/{ => dia-app}/xml/gtkdocentities.ent.in |   0
 docs/{ => dia-app}/xml/meson.build           |   0
 docs/{ => dia}/dia-docs.xml                  |  75 ++++--------------
 docs/dia/meson.build                         |  40 ++++++++++
 docs/dia/xml/gtkdocentities.ent.in           |   9 +++
 docs/dia/xml/meson.build                     |  11 +++
 docs/meson.build                             |  43 +----------
 lib/meson.build                              |  55 +++++++++++++-
 plug-ins/layout/meson.build                  |   2 +-
 plug-ins/python/meson.build                  |   2 +-
 13 files changed, 301 insertions(+), 116 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 0591e2ac..37f7b0b6 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -56,8 +56,6 @@ dia_sources = [
     'highlight.c',
     'textedit.c',
     'textedit_tool.c',
-
-    'main.c'
 ]
 
 #TODO: this is workaround for openbsd where libraries are in /usr/lib/local
@@ -77,15 +75,28 @@ resources = gnome.compile_resources('dia-resources', 'dia.gresource.xml',
                                     source_dir : '.',
                                     c_name : 'dia')
 
+diaapp_lib = both_libraries('diaapp',
+                            dia_sources + [diamarshal_h, config_h],
+                            dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep],
+                            link_args: dia_link_args,
+                            export_dynamic: true,  # some plugins require this.
+                            include_directories: [configuration_inc])
+
+diaapp_dep = declare_dependency (include_directories: diaapp_inc,
+                                 link_with: diaapp_lib.get_static_lib(),
+                                 dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep])
+
+diaapp_dep_for_docs = declare_dependency (include_directories: diaapp_inc,
+                                          link_with: diaapp_lib.get_shared_lib(),
+                                          dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep])
+
 diaapp = executable('dia',
-    dia_sources + [resources, diamarshal_h, config_h],
-    dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep],
-    link_args: dia_link_args,
-    export_dynamic: true,  # some plugins require this.
-    include_directories: [configuration_inc],
-    gui_app: true,
-    install: true,
-)
+                    ['main.c', resources],
+                    dependencies: [diaapp_dep],
+                    include_directories: [configuration_inc],
+                    gui_app: true,
+                    export_dynamic: true,  # some plugins require this.
+                    install: true)
 
 if build_machine.system() == 'windows'
     dia_win_remote = executable(
diff --git a/docs/dia-app/dia-app-docs.xml b/docs/dia-app/dia-app-docs.xml
new file mode 100644
index 00000000..f18db812
--- /dev/null
+++ b/docs/dia-app/dia-app-docs.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+  %gtkdocentities;
+]>
+<book id="index">
+  <bookinfo>
+    <title>&package_name; Reference Manual</title>
+    <releaseinfo>
+      <para>This document is the API reference for &package_name; &package_version;</para>
+      <para>
+        If you find any issues in this API reference, please report it
+        using <ulink type="http" url="&package_bugreport;">at the
+        bugtracker</ulink>
+      </para>
+    </releaseinfo>
+
+    <copyright>
+      <year>2019</year>
+      <holder>Zander Brown</holder>
+    </copyright>
+  </bookinfo>
+
+  <part id="core-api">
+    <title>Objects</title>
+    <xi:include href="xml/autosave.xml" />
+    <xi:include href="xml/commands.xml" />
+    <xi:include href="xml/confirm.xml" />
+    <xi:include href="xml/connectionpoint_ops.xml" />
+    <xi:include href="xml/create_object.xml" />
+    <xi:include href="xml/cursor.xml" />
+    <xi:include href="xml/cut_n_paste.xml" />
+    <xi:include href="xml/defaults.xml" />
+    <xi:include href="xml/dia-application.xml" />
+    <xi:include href="xml/dia-colour-area.xml" />
+    <xi:include href="xml/diagram_tree_model.xml" />
+    <xi:include href="xml/diagram_tree.xml" />
+    <xi:include href="xml/diagram.xml" />
+    <xi:include href="xml/diagrid.xml" />
+    <xi:include href="xml/dia-line-width-area.xml" />
+    <xi:include href="xml/diapagelayout.xml" />
+    <xi:include href="xml/dia-props.xml" />
+    <xi:include href="xml/disp_callbacks.xml" />
+    <xi:include href="xml/display.xml" />
+    <xi:include href="xml/dynamic_refresh.xml" />
+    <xi:include href="xml/exit_dialog.xml" />
+    <xi:include href="xml/filedlg.xml" />
+    <xi:include href="xml/find-and-replace.xml" />
+    <xi:include href="xml/grid.xml" />
+    <xi:include href="xml/gtkhwrapbox.xml" />
+    <xi:include href="xml/gtkwrapbox.xml" />
+    <xi:include href="xml/handle_ops.xml" />
+    <xi:include href="xml/highlight.xml" />
+    <xi:include href="xml/interface.xml" />
+    <xi:include href="xml/layer_dialog.xml" />
+    <xi:include href="xml/load_save.xml" />
+    <xi:include href="xml/magnify.xml" />
+    <xi:include href="xml/menus.xml" />
+    <xi:include href="xml/modify_tool.xml" />
+    <xi:include href="xml/navigation.xml" />
+    <xi:include href="xml/object_index.sgml" />
+    <xi:include href="xml/object_ops.xml" />
+    <xi:include href="xml/pagesetup.xml" />
+    <xi:include href="xml/plugin-manager.xml" />
+    <xi:include href="xml/preferences.xml" />
+    <xi:include href="xml/properties-dialog.xml" />
+    <xi:include href="xml/recent_files.xml" />
+    <xi:include href="xml/ruler.xml" />
+    <xi:include href="xml/scroll_tool.xml" />
+    <xi:include href="xml/select.xml" />
+    <xi:include href="xml/sheets_dialog_callbacks.xml" />
+    <xi:include href="xml/sheets_dialog.xml" />
+    <xi:include href="xml/sheets.xml" />
+    <xi:include href="xml/textedit_tool.xml" />
+    <xi:include href="xml/textedit.xml" />
+    <xi:include href="xml/toolbox.xml" />
+    <xi:include href="xml/tool.xml" />
+    <xi:include href="xml/undo.xml" />
+  </part>
+
+  <chapter id="object-tree">
+    <title>Object Hierarchy</title>
+    <xi:include href="xml/tree_index.sgml"/>
+  </chapter>
+
+  <index id="api-index-full">
+    <title>API Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <index id="api-index-0.98">
+    <title>API added in 0.98</title>
+    <xi:include href="xml/api-index-0.98.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <index id="deprecated-api-index" role="deprecated">
+    <title>Index of deprecated API</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <index id="annotations-glossary">
+  <title>Annotations glossary</title>
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+  </index>
+
+</book>
diff --git a/docs/dia-app/meson.build b/docs/dia-app/meson.build
new file mode 100644
index 00000000..7e981cf5
--- /dev/null
+++ b/docs/dia-app/meson.build
@@ -0,0 +1,40 @@
+if get_option('gtk_doc')
+
+subdir('xml')
+
+private_headers = [
+]
+
+images = [
+]
+
+content_files = [
+]
+
+glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')
+
+gnome.gtkdoc('dia-app',
+           main_xml: 'dia-app-docs.xml',
+            src_dir: [
+                       diaapp_inc
+                     ],
+       dependencies: diaapp_dep_for_docs,
+  gobject_typesfile: 'dia-app.types',
+          scan_args: [
+                       '--rebuild-types',
+                       '--ignore-headers=' + ' '.join(private_headers),
+                     ],
+       fixxref_args: [
+                       '--html-dir=@0@'.format(docpath),
+                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+                     ],
+        install_dir: 'dia-app',
+      content_files: content_files,
+        html_assets: images,
+            install: true)
+
+endif
diff --git a/docs/xml/gtkdocentities.ent.in b/docs/dia-app/xml/gtkdocentities.ent.in
similarity index 100%
rename from docs/xml/gtkdocentities.ent.in
rename to docs/dia-app/xml/gtkdocentities.ent.in
diff --git a/docs/xml/meson.build b/docs/dia-app/xml/meson.build
similarity index 100%
rename from docs/xml/meson.build
rename to docs/dia-app/xml/meson.build
diff --git a/docs/dia-docs.xml b/docs/dia/dia-docs.xml
similarity index 67%
rename from docs/dia-docs.xml
rename to docs/dia/dia-docs.xml
index 31463ad8..9b052a57 100644
--- a/docs/dia-docs.xml
+++ b/docs/dia/dia-docs.xml
@@ -27,37 +27,24 @@
   <part id="core-api">
     <title>Objects</title>
     <xi:include href="xml/diagramdata.xml"/>
+    <xi:include href="xml/dia-layer.xml"/>
     <xi:include href="xml/group.xml"/>
     <xi:include href="xml/prop_dict.xml"/>
-    <xi:include href="xml/diagram_tree_model.xml"/>
-    <xi:include href="xml/properties-dialog.xml"/>
-    <xi:include href="xml/app_procs.xml"/>
-    <xi:include href="xml/diagram_tree.xml"/>
-    <xi:include href="xml/gtkhwrapbox.xml"/>
     <xi:include href="xml/properties.xml"/>
     <xi:include href="xml/arrows.xml"/>
-    <xi:include href="xml/diagram.xml"/>
-    <xi:include href="xml/gtkvwrapbox.xml"/>
     <xi:include href="xml/prop_geomtypes.xml"/>
     <xi:include href="xml/attributes.xml"/>
-    <xi:include href="xml/diagrid.xml"/>
-    <xi:include href="xml/gtkwrapbox.xml"/>
     <xi:include href="xml/propinternals.xml"/>
     <xi:include href="xml/autoroute.xml"/>
     <xi:include href="xml/dia_image.xml"/>
-    <xi:include href="xml/handle_ops.xml"/>
     <xi:include href="xml/prop_inttypes.xml"/>
-    <xi:include href="xml/autosave.xml"/>
-    <xi:include href="xml/diaimportrenderer.xml"/>
     <xi:include href="xml/handle.xml"/>
     <xi:include href="xml/prop_matrix.xml"/>
     <xi:include href="xml/bezier-common.xml"/>
     <xi:include href="xml/dialib.xml"/>
-    <xi:include href="xml/highlight.xml"/>
     <xi:include href="xml/prop_pattern.xml"/>
     <xi:include href="xml/bezier_conn.xml"/>
     <xi:include href="xml/dialinechooser.xml"/>
-    <xi:include href="xml/interface.xml"/>
     <xi:include href="xml/prop_pixbuf.xml"/>
     <xi:include href="xml/beziershape.xml"/>
     <xi:include href="xml/dialogs.xml"/>
@@ -65,53 +52,30 @@
     <xi:include href="xml/prop_sdarray.xml"/>
     <xi:include href="xml/boundingbox.xml"/>
     <xi:include href="xml/diamenu.xml"/>
-    <xi:include href="xml/layer_dialog.xml"/>
     <xi:include href="xml/prop_text.xml"/>
-    <xi:include href="xml/color_area.xml"/>
     <xi:include href="xml/diaoptionmenu.xml"/>
-    <xi:include href="xml/linewidth_area.xml"/>
     <xi:include href="xml/prop_widgets.xml"/>
     <xi:include href="xml/color.xml"/>
-    <xi:include href="xml/diapagelayout.xml"/>
-    <xi:include href="xml/load_save.xml"/>
-    <xi:include href="xml/recent_files.xml"/>
-    <xi:include href="xml/commands.xml"/>
-    <xi:include href="xml/diapathrenderer.xml"/>
-    <xi:include href="xml/magnify.xml"/>
-    <xi:include href="xml/render_gdk.xml"/>
-    <xi:include href="xml/confirm.xml"/>
     <xi:include href="xml/diapatternselector.xml"/>
-    <xi:include href="xml/menus.xml"/>
-    <xi:include href="xml/render_pixmap.xml"/>
-    <xi:include href="xml/connectionpoint_ops.xml"/>
-    <xi:include href="xml/dia-props.xml"/>
     <xi:include href="xml/message.xml"/>
-    <xi:include href="xml/ruler.xml"/>
     <xi:include href="xml/connectionpoint.xml"/>
     <xi:include href="xml/diarenderer.xml"/>
-    <xi:include href="xml/modify_tool.xml"/>
-    <xi:include href="xml/scroll_tool.xml"/>
-    <xi:include href="xml/connection.xml"/>
+    <xi:include href="xml/diainteractiverenderer.xml"/>
+    <xi:include href="xml/diaimportrenderer.xml"/>
+    <xi:include href="xml/diapathrenderer.xml"/>
     <xi:include href="xml/diasvgrenderer.xml"/>
-    <xi:include href="xml/navigation.xml"/>
-    <xi:include href="xml/select.xml"/>
+    <xi:include href="xml/diatransformrenderer.xml"/>
+    <xi:include href="xml/diacairo.xml"/>
+    <xi:include href="xml/connection.xml"/>
     <xi:include href="xml/connpoint_line.xml"/>
     <xi:include href="xml/dia_svg.xml"/>
     <xi:include href="xml/objchange.xml"/>
-    <xi:include href="xml/sheets_dialog_callbacks.xml"/>
-    <xi:include href="xml/create_object.xml"/>
-    <xi:include href="xml/diatransformrenderer.xml"/>
     <xi:include href="xml/object-alias.xml"/>
-    <xi:include href="xml/sheets_dialog.xml"/>
     <xi:include href="xml/create.xml"/>
     <xi:include href="xml/diatransform.xml"/>
     <xi:include href="xml/object_index.sgml"/>
-    <xi:include href="xml/sheets.xml"/>
-    <xi:include href="xml/cursor.xml"/>
     <xi:include href="xml/diatypes.xml"/>
-    <xi:include href="xml/object_ops.xml"/>
     <xi:include href="xml/sheet.xml"/>
-    <xi:include href="xml/cut_n_paste.xml"/>
     <xi:include href="xml/diavar.xml"/>
     <xi:include href="xml/object.xml"/>
     <xi:include href="xml/standard-path.xml"/>
@@ -119,16 +83,8 @@
     <xi:include href="xml/dia_xml_libxml.xml"/>
     <xi:include href="xml/orth_conn.xml"/>
     <xi:include href="xml/textattr.xml"/>
-    <xi:include href="xml/defaults.xml"/>
     <xi:include href="xml/dia_xml.xml"/>
-    <xi:include href="xml/pagesetup.xml"/>
-    <xi:include href="xml/textedit_tool.xml"/>
-    <xi:include href="xml/dia-application.xml"/>
-    <xi:include href="xml/disp_callbacks.xml"/>
-    <xi:include href="xml/paper.xml"/>
-    <xi:include href="xml/textedit.xml"/>
     <xi:include href="xml/diaarrowchooser.xml"/>
-    <xi:include href="xml/display.xml"/>
     <xi:include href="xml/parent.xml"/>
     <xi:include href="xml/textline.xml"/>
     <xi:include href="xml/diacellrendererenum.xml"/>
@@ -136,29 +92,20 @@
     <xi:include href="xml/path-math.xml"/>
     <xi:include href="xml/text.xml"/>
     <xi:include href="xml/diacellrendererproperty.xml"/>
-    <xi:include href="xml/dynamic_refresh.xml"/>
     <xi:include href="xml/pattern.xml"/>
-    <xi:include href="xml/toolbox.xml"/>
     <xi:include href="xml/diacontext.xml"/>
     <xi:include href="xml/element.xml"/>
     <xi:include href="xml/persistence.xml"/>
-    <xi:include href="xml/tool.xml"/>
     <xi:include href="xml/dia_dirs.xml"/>
-    <xi:include href="xml/exit_dialog.xml"/>
-    <xi:include href="xml/plugin-manager.xml"/>  
-    <xi:include href="xml/filedlg.xml"/>
     <xi:include href="xml/plug-ins.xml"/>
-    <xi:include href="xml/undo.xml"/>
     <xi:include href="xml/filter.xml"/>
     <xi:include href="xml/poly_conn.xml"/>
     <xi:include href="xml/units.xml"/>
     <xi:include href="xml/diadynamicmenu.xml"/>
-    <xi:include href="xml/find-and-replace.xml"/>
     <xi:include href="xml/polyshape.xml"/>
     <xi:include href="xml/utils.xml"/>
     <xi:include href="xml/dia-enums.xml"/>
     <xi:include href="xml/focus.xml"/>
-    <xi:include href="xml/preferences.xml"/>
     <xi:include href="xml/widgets.xml"/>
     <xi:include href="xml/diaerror.xml"/>
     <xi:include href="xml/font.xml"/>
@@ -166,9 +113,8 @@
     <xi:include href="xml/diafontselector.xml"/>
     <xi:include href="xml/geometry.xml"/>
     <xi:include href="xml/prop_attr.xml"/>
-    <xi:include href="xml/diagdkrenderer.xml"/>
-    <xi:include href="xml/grid.xml"/>
     <xi:include href="xml/prop_basic.xml"/>
+    <xi:include href="xml/diamarshal.xml"/>
   </part>
 
   <chapter id="object-tree">
@@ -181,6 +127,11 @@
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
 
+  <index id="api-index-0.98">
+    <title>API added in 0.98</title>
+    <xi:include href="xml/api-index-0.98.xml"><xi:fallback /></xi:include>
+  </index>
+
   <index id="deprecated-api-index" role="deprecated">
     <title>Index of deprecated API</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
diff --git a/docs/dia/meson.build b/docs/dia/meson.build
new file mode 100644
index 00000000..30c5f7e5
--- /dev/null
+++ b/docs/dia/meson.build
@@ -0,0 +1,40 @@
+if get_option('gtk_doc')
+
+subdir('xml')
+
+private_headers = [
+]
+
+images = [
+]
+
+content_files = [
+]
+
+glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')
+
+gnome.gtkdoc('dia',
+           main_xml: 'dia-docs.xml',
+            src_dir: [
+                       libdia_inc
+                     ],
+       dependencies: libdia_dep,
+  gobject_typesfile: 'dia.types',
+          scan_args: [
+                       '--rebuild-types',
+                       '--ignore-headers=' + ' '.join(private_headers),
+                     ],
+       fixxref_args: [
+                       '--html-dir=@0@'.format(docpath),
+                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+                     ],
+        install_dir: 'dia',
+      content_files: content_files,
+        html_assets: images,
+            install: true)
+
+endif
diff --git a/docs/dia/xml/gtkdocentities.ent.in b/docs/dia/xml/gtkdocentities.ent.in
new file mode 100644
index 00000000..db8f29d2
--- /dev/null
+++ b/docs/dia/xml/gtkdocentities.ent.in
@@ -0,0 +1,9 @@
+<!ENTITY package "@PACKAGE@">
+<!ENTITY package_bugreport "@PACKAGE_BUGREPORT@">
+<!ENTITY package_name "@PACKAGE_NAME@">
+<!ENTITY package_string "@PACKAGE_STRING@">
+<!ENTITY package_tarname "@PACKAGE_TARNAME@">
+<!ENTITY package_url "@PACKAGE_URL@">
+<!ENTITY package_version "@PACKAGE_VERSION@">
+<!ENTITY package_api_version "@PACKAGE_API_VERSION@">
+<!ENTITY package_ver_str "@PACKAGE_STRING@-@PACKAGE_API_VERSION@">
diff --git a/docs/dia/xml/meson.build b/docs/dia/xml/meson.build
new file mode 100644
index 00000000..e3c5e137
--- /dev/null
+++ b/docs/dia/xml/meson.build
@@ -0,0 +1,11 @@
+ent_conf = configuration_data()
+ent_conf.set('PACKAGE', 'Dia')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/dia/issues')
+ent_conf.set('PACKAGE_NAME', 'Dia')
+ent_conf.set('PACKAGE_STRING', 'dia')
+ent_conf.set('PACKAGE_TARNAME', 'dia-' + meson.project_version())
+ent_conf.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/dia')
+ent_conf.set('PACKAGE_VERSION', meson.project_version())
+ent_conf.set('PACKAGE_API_VERSION', '0.0')
+configure_file(input: 'gtkdocentities.ent.in', output: 'gtkdocentities.ent', configuration: ent_conf)
+
diff --git a/docs/meson.build b/docs/meson.build
index a3446c0f..6a0d269a 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,41 +1,2 @@
-if get_option('gtk_doc')
-
-subdir('xml')
-
-private_headers = [
-]
-
-images = [
-]
-
-content_files = [
-]
-
-glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
-docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')
-
-gnome.gtkdoc('dia',
-           main_xml: 'dia-docs.xml',
-            src_dir: [
-                       join_paths(meson.source_root(), 'lib'),
-                       join_paths(meson.build_root(), 'lib'),
-                     ],
-       dependencies: [libdia_dep, libgtk_dep, libxml_dep, libm_dep],
-  gobject_typesfile: 'dia.types',
-          scan_args: [
-                       '--rebuild-types',
-                       '--ignore-headers=' + ' '.join(private_headers),
-                     ],
-       fixxref_args: [
-                       '--html-dir=@0@'.format(docpath),
-                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
-                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
-                       '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
-                     ],
-        install_dir: 'dia',
-      content_files: content_files,
-        html_assets: images,
-            install: true)
-
-endif
+subdir('dia')
+subdir('dia-app')
diff --git a/lib/meson.build b/lib/meson.build
index d1627d3b..3b1eac81 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -1,69 +1,122 @@
 stdprop_sources = [
     'properties.c',
+    'properties.h',
     'propdesc.c',
     'proplist.c',
     'propoffsets.c',
     'propobject.c',
     'prop_basic.c',
+    'prop_basic.h',
     'prop_dict.c',
+    'prop_dict.h',
     'prop_matrix.c',
+    'prop_matrix.h',
     'prop_pattern.c',
+    'prop_pattern.h',
     'prop_pixbuf.c',
+    'prop_pixbuf.h',
     'prop_inttypes.c',
+    'prop_inttypes.h',
     'prop_geomtypes.c',
+    'prop_geomtypes.h',
     'prop_attr.c',
+    'prop_attr.h',
     'prop_text.c',
+    'prop_text.h',
     'prop_widgets.c',
+    'prop_widgets.h',
     'prop_sdarray.c',
+    'prop_sdarray.h',
     'prop_sdarray_widget.c',
+    'prop_sdarray_widget.h',
     'propdialogs.c',
-    'propregistry.c'
+    'propregistry.c',
 ]
 
 libdia_sources = stdprop_sources + [
     'diagramdata.c',
+    'diagramdata.h',
     'layer.c',
     'dia-layer.h',
     'geometry.c',
+    'geometry.h',
     'color.c',
+    'color.h',
+    'dia_xml.c',
     'dia_xml.c',
     'attributes.c',
+    'attributes.h',
     'text.c',
+    'text.h',
     'textline.c',
+    'textline.h',
     'font.c',
+    'font.h',
     'group.c',
+    'group.h',
     'utils.c',
+    'utils.h',
     'arrows.c',
+    'arrows.h',
     'message.c',
+    'message.h',
     'focus.c',
+    'focus.h',
     'sheet.c',
+    'sheet.h',
     'connectionpoint.c',
+    'connectionpoint.h',
     'object.c',
+    'object.h',
     'object-alias.c',
+    'object-alias.h',
     'object_defaults.c',
     'connection.c',
+    'connection.h',
     'orth_conn.c',
+    'orth_conn.h',
     'poly_conn.c',
+    'poly_conn.h',
     'bezier_conn.c',
+    'bezier_conn.h',
     'bezier-common.c',
+    'bezier-common.h',
     'element.c',
+    'element.h',
     'polyshape.c',
+    'polyshape.h',
     'beziershape.c',
+    'beziershape.h',
     'objchange.c',
+    'objchange.h',
     'dialogs.c',
+    'dialogs.h',
     'widgets.c',
+    'widgets.h',
     'diaoptionmenu.c',
+    'diaoptionmenu.h',
     'units.c',
+    'units.h',
+    'dia_image.c',
     'dia_image.c',
     'pattern.c',
+    'pattern.h',
     'standard-path.c',
+    'standard-path.h',
     'intl.c',
+    'intl.h',
     'filter.c',
+    'filter.h',
     'connpoint_line.c',
+    'connpoint_line.h',
     'dia_dirs.c',
+    'dia_dirs.h',
     'plug-ins.c',
+    'plug-ins.h',
     'paper.c',
+    'paper.h',
     'boundingbox.c',
+    'boundingbox.h',
     'dynamic_obj.c',
     'create.c',
     'diatransform.c',
diff --git a/plug-ins/layout/meson.build b/plug-ins/layout/meson.build
index 91d5c5f9..da5dd2df 100644
--- a/plug-ins/layout/meson.build
+++ b/plug-ins/layout/meson.build
@@ -18,7 +18,7 @@ shared_module(
     sources + [config_h],
     dependencies: [deps, libdia_dep],
     include_directories: [configuration_inc, diaapp_inc],
-    link_with: [diaapp],
+    link_with: [diaapp], # Naughty
     install: true,
     install_dir: dialibdir
 )
diff --git a/plug-ins/python/meson.build b/plug-ins/python/meson.build
index 998d7912..2ac952e1 100644
--- a/plug-ins/python/meson.build
+++ b/plug-ins/python/meson.build
@@ -52,7 +52,7 @@ if py_dep.found()
         sources + [config_h],
         dependencies: [libc_dep, libxml_dep, libgtk_dep, py_dep, libdia_dep],
         include_directories: [configuration_inc, diaapp_inc],
-        link_with: [diaapp],
+        link_with: [diaapp], # Naughty
         install: true,
         install_dir: dialibdir
     )
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]