Commit 26b00bdf authored by Eduard's avatar Eduard

#19: Build objects/standard.

  - builddir/app/dia now works!
  - installdir/bin/dia also works
    (not sure if rpath is the correct solution)
parent 9c20d5d4
......@@ -69,4 +69,6 @@ dia = executable('dia',
link_with : libdia,
include_directories : [configuration_inc, libdia_inc],
gui_app : true,
install : true)
install : true,
install_rpath : join_paths(get_option('prefix'), get_option('libdir'))
)
......@@ -137,4 +137,5 @@ libdia = shared_library('dia',
include_directories : configuration_inc,
c_args : ['-Wall'],
install : true,
install_dir : join_paths(get_option('libdir'), 'dia'))
install_rpath : get_option('prefix')
)
......@@ -38,8 +38,8 @@ conf = configuration_data()
prefix = get_option('prefix')
conf.set_quoted('VERSION', meson.project_version())
conf.set_quoted('GETTEXT_PACKAGE', 'dia')
conf.set_quoted('DATADIR', get_option('datadir'))
conf.set_quoted('LIBDIR', get_option('libdir'))
conf.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
conf.set_quoted('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
conf.set_quoted('LOCALEDIR', get_option('localedir'))
conf.set('ENABLE_NLS', 1)
......@@ -60,4 +60,5 @@ configuration_inc = include_directories('.')
add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
subdir('lib')
subdir('objects')
subdir('app')
subdir('standard')
subdir('pixmaps')
standard_objects_sources = [
'arc.c',
'box.c',
'ellipse.c',
'textobj.c',
'line.c',
'zigzagline.c',
'polyline.c',
'bezier.c',
'standard.c',
'image.c',
'outline.c',
'polygon.c',
'beziergon.c'
]
standard_objects = library('standard_objects',
standard_objects_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')
)
icons = [ 'arc.png',
'beziergon.png',
'bezierline.png',
'box.png',
'ellipse.png',
'image.png',
'line.png',
'outline.png',
'polygon.png',
'polyline.png',
'text.png',
'zigzagline.png' ]
#FIXME: this is duplicated from lib/pixmaps. Any way to remove this duplication?
icon_pairs = []
foreach icon_file : icons
icon_pairs += [icon_file.split('.')[0].underscorify() + '_icon', files(icon_file)]
endforeach
tool_icons_h = custom_target(
'tool-icons.h',
output : 'tool-icons.h',
capture : true,
command : [ gdk_pixbuf_csource,
'--raw',
'--build-list',
icon_pairs ])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment