7 files changed, 289 insertions, 17 deletions
diff --git a/src/2geom/meson.build b/src/2geom/meson.build
index 1eb1c9cec..3fec01988 100644
--- a/src/2geom/meson.build
+++ b/src/2geom/meson.build
@@ -138,8 +138,6 @@ lib2geom = static_library('2geom',
   sources: [lib_2geom_sources,
             lib_2geom_headers],
   dependencies: lib_2geom_deps,
-  include_directories: [srcinc, confinc],
-  c_args: common_cflags,
-  link_args: common_ldflags)
+  include_directories: [srcinc, confinc])
 
 lib2geom_dep = declare_dependency(link_with : lib2geom)
diff --git a/src/helper/meson.build b/src/helper/meson.build
index ed0ed370f..115a4deb8 100644
--- a/src/helper/meson.build
+++ b/src/helper/meson.build
@@ -32,8 +32,9 @@ helper_headers = files([
 ])
 
 marshallers = gnome.genmarshal('sp-marshal',
-sources : 'sp-marshal.list',
-extra_args : ['-UG_ENABLE_DEBUG', '--prototypes'])
+  sources : 'sp-marshal.list',
+  prefix : 'sp_marshal',
+  extra_args : ['-UG_ENABLE_DEBUG', '--prototypes'])
 
 marshallers_c = marshallers[0]
 marshallers_h = marshallers[1]
diff --git a/src/inkgc/meson.build b/src/inkgc/meson.build
index c69603315..c658b1c88 100644
--- a/src/inkgc/meson.build
+++ b/src/inkgc/meson.build
@@ -21,8 +21,6 @@ libinkgc = static_library('inkgc',
   sources: [inkgc_sources,
             inkgc_headers],
   dependencies: inkgc_deps,
-  include_directories: [srcinc, confinc],
-  c_args: common_cflags,
-  link_args: common_ldflags)
+  include_directories: [srcinc, confinc])
 
 libinkgc_dep = declare_dependency(link_with : libinkgc)
diff --git a/src/libnrtype/meson.build b/src/libnrtype/meson.build
index c35c89f49..5dfe4bce4 100644
--- a/src/libnrtype/meson.build
+++ b/src/libnrtype/meson.build
@@ -32,8 +32,6 @@ libnrtype = static_library('nrtype',
   sources: [layout_tng_sources,
             layout_tng_headers],
   dependencies: layout_tng_deps,
-  include_directories: [srcinc, confinc],
-  c_args: common_cflags,
-  link_args: common_ldflags)
+  include_directories: [srcinc, confinc])
 
 libnrtype_dep = declare_dependency(link_with : libnrtype)
diff --git a/src/meson.build b/src/meson.build
index 74b0b63f9..b7d560209 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,274 @@
+# All folders for internal inkscape
+# these call add_inkscape_source
+#add_subdirectory(debug)
+#add_subdirectory(display)
+#add_subdirectory(extension)
+#add_subdirectory(helper)
+#add_subdirectory(io)
+#add_subdirectory(live_effects)
+#add_subdirectory(svg)
+#add_subdirectory(trace)
+#add_subdirectory(util)
+#add_subdirectory(widgets)
+#add_subdirectory(xml)
+
+# Directories containing lists files that describe building internal libraries
+#add_subdirectory(libavoid)
+#add_subdirectory(libcola)
+#add_subdirectory(libcroco)
+#add_subdirectory(libuemf)
+#add_subdirectory(libvpsc)
+#add_subdirectory(livarot)
+#add_subdirectory(libdepixelize)
+
 subdir('2geom')
 subdir('helper')
 subdir('inkgc')
 subdir('libnrtype')
 subdir('object')
 subdir('ui')
+
+srcdir_sources = files([
+  'attribute-rel-css.cpp',
+  'attribute-rel-svg.cpp',
+  'attribute-rel-util.cpp',
+  'attribute-sort-util.cpp',
+  'attributes.cpp',
+  'axis-manip.cpp',
+  'color.cpp',
+  'composite-undo-stack-observer.cpp',
+  'conditions.cpp',
+  'conn-avoid-ref.cpp',
+  'console-output-undo-observer.cpp',
+  'context-fns.cpp',
+  'desktop-events.cpp',
+  'desktop-style.cpp',
+  'desktop.cpp',
+  'device-manager.cpp',
+  'dir-util.cpp',
+  'document-subset.cpp',
+  'document-undo.cpp',
+  'document.cpp',
+  'ege-color-prof-tracker.cpp',
+  'event-log.cpp',
+  'extract-uri.cpp',
+  'file.cpp',
+  'file-update.cpp',
+  'filter-chemistry.cpp',
+  'filter-enums.cpp',
+  'gc-anchored.cpp',
+  'gc-finalized.cpp',
+  'gradient-chemistry.cpp',
+  'gradient-drag.cpp',
+  'graphlayout.cpp',
+  'guide-snapper.cpp',
+  'help.cpp',
+  'id-clash.cpp',
+  'inkscape.cpp',
+  'knot-holder-entity.cpp',
+  'knot-ptr.cpp',
+  'knot.cpp',
+  'knotholder.cpp',
+  'layer-fns.cpp',
+  'layer-manager.cpp',
+  'layer-model.cpp',
+  'line-geometry.cpp',
+  'line-snapper.cpp',
+  'main-cmdlineact.cpp',
+  'main-cmdlinexact.cpp',
+  'media.cpp',
+  'message-context.cpp',
+  'message-stack.cpp',
+  'mod360.cpp',
+  'object-hierarchy.cpp',
+  'object-snapper.cpp',
+  'path-chemistry.cpp',
+  'path-prefix.cpp',
+  'perspective-line.cpp',
+  'preferences.cpp',
+  'prefix.cpp',
+  'print.cpp',
+  'profile-manager.cpp',
+  'proj_pt.cpp',
+  'pure-transform.cpp',
+  'rdf.cpp',
+  'removeoverlap.cpp',
+  'resource-manager.cpp',
+  'rubberband.cpp',
+  'satisfied-guide-cns.cpp',
+  'selcue.cpp',
+  'selection-chemistry.cpp',
+  'selection-describer.cpp',
+  'selection.cpp',
+  'seltrans-handles.cpp',
+  'seltrans.cpp',
+  'shortcuts.cpp',
+  'snap-preferences.cpp',
+  'snap.cpp',
+  'snapped-curve.cpp',
+  'snapped-line.cpp',
+  'snapped-point.cpp',
+  'snapper.cpp',
+  'splivarot.cpp',
+  'sp-cursor.cpp',
+  'sp-item-notify-moveto.cpp',
+  'style-internal.cpp',
+  'style.cpp',
+  'svg-view-slideshow.cpp',
+  'svg-view-widget.cpp',
+  'svg-view.cpp',
+  'text-chemistry.cpp',
+  'text-editing.cpp',
+  'transf_mat_3x4.cpp',
+  'unclump.cpp',
+  'unicoderange.cpp',
+  'vanishing-point.cpp',
+  'verbs.cpp',
+  'version.cpp'
+])
+
+srcdir_headers = files([
+  'attribute-rel-css.h',
+  'attribute-rel-svg.h',
+  'attribute-rel-util.h',
+  'attribute-sort-util.h',
+  'attributes.h',
+  'axis-manip.h',
+  'bad-uri-exception.h',
+  'cms-color-types.h',
+  'cms-system.h',
+  'color-profile-cms-fns.h',
+  'color-rgba.h',
+  'color.h',
+  'colorspace.h',
+  'composite-undo-stack-observer.h',
+  'conditions.h',
+  'conn-avoid-ref.h',
+  'console-output-undo-observer.h',
+  'context-fns.h',
+  'decimal-round.h',
+  'desktop-events.h',
+  'desktop-style.h',
+  'desktop.h',
+  'device-manager.h',
+  'dir-util.h',
+  'document-private.h',
+  'document-subset.h',
+  'document-undo.h',
+  'document.h',
+  'ege-color-prof-tracker.h',
+  'enums.h',
+  'event-log.h',
+  'event.h',
+  'extract-uri.h',
+  'file.h',
+  'fill-or-stroke.h',
+  'filter-chemistry.h',
+  'filter-enums.h',
+  'gc-anchored.h',
+  'gc-finalized.h',
+  'gradient-chemistry.h',
+  'gradient-drag.h',
+  'graphlayout.h',
+  'guide-snapper.h',
+  'help.h',
+  'helper-fns.h',
+  'id-clash.h',
+  'inkscape-version.h',
+  'inkscape.h',
+  'knot-enums.h',
+  'knot-holder-entity.h',
+  'knot-ptr.h',
+  'knot.h',
+  'knotholder.h',
+  'layer-fns.h',
+  'layer-manager.h',
+  'layer-model.h',
+  'line-geometry.h',
+  'line-snapper.h',
+  'macros.h',
+  'main-cmdlineact.h',
+  'main-cmdlinexact.h',
+  'media.h',
+  'menus-skeleton.h',
+  'message-context.h',
+  'message-stack.h',
+  'message.h',
+  'mod360.h',
+  'number-opt-number.h',
+  'object-hierarchy.h',
+  'object-snapper.h',
+  'path-chemistry.h',
+  'path-prefix.h',
+  'perspective-line.h',
+  'preferences-skeleton.h',
+  'preferences.h',
+  'prefix.h',
+  'print.h',
+  'profile-manager.h',
+  'proj_pt.h',
+  'pure-transform.h',
+  'rdf.h',
+  'remove-last.h',
+  'removeoverlap.h',
+  'resource-manager.h',
+  'rubberband.h',
+  'satisfied-guide-cns.h',
+  'selcue.h',
+  'selection-chemistry.h',
+  'selection-describer.h',
+  'selection.h',
+  'seltrans-handles.h',
+  'seltrans.h',
+  'shortcuts.h',
+  'snap-candidate.h',
+  'snap-enums.h',
+  'snap-preferences.h',
+  'snap.h',
+  'snapped-curve.h',
+  'snapped-line.h',
+  'snapped-point.h',
+  'snapper.h',
+  'sp-cursor.h',
+  'sp-guide-attachment.h',
+  'sp-guide-constraint.h',
+  'sp-item-notify-moveto.h',
+  'splivarot.h',
+  'streq.h',
+  'strneq.h',
+  'style-enums.h',
+  'style-internal.h',
+  'style.h',
+  'svg-profile.h',
+  'svg-view-slideshow.h',
+  'svg-view-widget.h',
+  'svg-view.h',
+  'syseq.h',
+  'text-chemistry.h',
+  'text-editing.h',
+  'text-tag-attributes.h',
+  'transf_mat_3x4.h',
+  'unclump.h',
+  'undo-stack-observer.h',
+  'unicoderange.h',
+  'vanishing-point.h',
+  'verbs.h',
+  'version.h'
+])
+
+srcdir_deps = [
+  gtkmm_dep,
+  glibmm_dep,
+  gdl_dep,
+  xml2_dep,
+  sigcpp_dep,
+  libhelper_dep
+]
+
+lib_srcdir = static_library('srcdir',
+  sources: [srcdir_sources,
+            srcdir_headers],
+  dependencies: srcdir_deps,
+  include_directories: [srcinc, confinc, helperinc])
+
+libsrcdir_dep = declare_dependency(link_with : lib_srcdir)
diff --git a/src/object/meson.build b/src/object/meson.build
index ea472d2fc..4e9baa28b 100644
--- a/src/object/meson.build
+++ b/src/object/meson.build
@@ -183,7 +183,6 @@ spobject_deps = [
   xml2_dep,
   gdkmm_dep,
   libhelper_dep
-#  gsl_dep
 #  spobject_filters_dep
 ]
 
@@ -191,8 +190,6 @@ spobject = static_library('spobject',
   sources: [spobject_sources,
             spobject_headers],
   dependencies: spobject_deps,
-  include_directories: [srcinc, confinc],
-  c_args: common_cflags,
-  link_args: common_ldflags)
+  include_directories: [srcinc, confinc])
 
 libspobject_dep = declare_dependency(link_with : spobject)
diff --git a/src/ui/meson.build b/src/ui/meson.build
index 9c6967cec..d5cb2d9ed 100644
--- a/src/ui/meson.build
+++ b/src/ui/meson.build
@@ -360,8 +360,6 @@ ui_headers = files([
   'view/view.h'
 ])
 
-
-
 #TODO:
 
 #if(WIN32)
@@ -380,3 +378,17 @@ ui_headers = files([
 #if ("${HAVE_POTRACE}")
 #	add_inkscape_source("${ui_flood_and_trace_SRC}")
 #endif()
+
+ui_deps = [
+  gtkmm_dep,
+  xml2_dep,
+  gdl_dep,
+]
+
+libui = static_library('ui',
+  sources: [ui_sources,
+            ui_headers],
+  dependencies: ui_deps,
+  include_directories: [srcinc, confinc])
+
+libui_dep = declare_dependency(link_with : libui)