[dia: 27/105] #19: Add objects/custom/meson.build & cleanup standard/meson.build.

[Zander <zbrown src gnome org>]

commit 8e548421bac0011a8d76c439ed1cdcf2894d0ccc
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Mon Dec 24 14:22:57 2018 +0000

    #19: Add objects/custom/meson.build & cleanup standard/meson.build.

 objects/custom/Makefile.am   |  5 +----
 objects/custom/meson.build   | 17 +++++++++++++++++
 objects/meson.build          |  1 +
 objects/standard/meson.build |  9 ++++-----
 4 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/objects/custom/Makefile.am b/objects/custom/Makefile.am
index f2bd9901..bc7baeaa 100644
--- a/objects/custom/Makefile.am
+++ b/objects/custom/Makefile.am
@@ -15,12 +15,9 @@ libcustom_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEF
 
 libcustom_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-shapedir = $(pkgdatadir)/shapes
-
 # add -DDEBUG_CUSTOM here to get extra debugging info.
 AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS) \
-       $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) \
-       -DDIA_SHAPEDIR=\""$(shapedir)"\"
+       $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
        pixmaps/custom.xpm
diff --git a/objects/custom/meson.build b/objects/custom/meson.build
new file mode 100644
index 00000000..3fc69ad8
--- /dev/null
+++ b/objects/custom/meson.build
@@ -0,0 +1,17 @@
+object_sources = [
+    'shape_info.c',
+    'shape_typeinfo.c',
+    'custom_object.c',
+    'custom_util.c',
+    'custom.c'
+]
+
+library('custom_objects',
+    object_sources,
+    dependencies : [libgtk_dep, libglib_dep, libxml_dep, libm_dep],
+    link_with : libdia,
+    include_directories : [configuration_inc, libdia_inc],
+    install : true,
+    install_dir : dialibdir
+)
+
diff --git a/objects/meson.build b/objects/meson.build
index 1cf69918..0fd629a4 100644
--- a/objects/meson.build
+++ b/objects/meson.build
@@ -1 +1,2 @@
 subdir('standard')
+subdir('custom')
diff --git a/objects/standard/meson.build b/objects/standard/meson.build
index 647897b4..e7fc7282 100644
--- a/objects/standard/meson.build
+++ b/objects/standard/meson.build
@@ -1,6 +1,6 @@
 subdir('pixmaps')
 
-standard_objects_sources = [
+object_sources = [
     'arc.c',
     'box.c',
     'ellipse.c',
@@ -16,13 +16,12 @@ standard_objects_sources = [
     'beziergon.c'
 ]
 
-standard_objects = library('standard_objects',
-    standard_objects_sources + [tool_icons_h],
+library('standard_objects',
+    object_sources + [tool_icons_h],
     dependencies : [libgtk_dep, libglib_dep, libxml_dep, libm_dep],
     link_with : libdia,
     include_directories : [configuration_inc, libdia_inc],
     install : true,
-    install_dir : join_paths(get_option('libdir'), 'dia')
+    install_dir : dialibdir
 )
 
-