Commit 827e5ea6 authored by Daniel Espinosa Ortiz's avatar Daniel Espinosa Ortiz

Libraries general installation fixes

parent 1d90e3ca
Pipeline #42379 passed with stages
in 16 minutes and 5 seconds
gio-2.0
gee-0.8
\ No newline at end of file
gee-0.8
libvala-@VALA_API_VERSION@
@JSONRPC@
@JSON@
......@@ -8,6 +8,6 @@ Name: gvls
Description: GNOME Vala Language Server library
URL: https://gitlab.gnome.org/esodan/gvls
Version: @PROJECT_VERSION@
Requires: glib-2.0 >= 2.50 gio-2.0 >= 2.50 gobject-2.0 >= 2.50 gee-0.8 > 0.18
Requires: glib-2.0 >= 2.50 gio-2.0 >= 2.50 gobject-2.0 >= 2.50 gee-0.8 > 0.18 libvala-@VALA_API_VERSION@ @JSONRPC@
Libs: -L${libdir} -lgvls-@API_VERSION@
Cflags: -I${includedir}/gvls-@API_VERSION@
......@@ -16,6 +16,12 @@ conf.set('libdir', '${exec_prefix}/'+get_option ('libdir'))
conf.set('PROJECT_NAME', PROJECT_NAME)
conf.set('PROJECT_VERSION', PROJECT_VERSION)
conf.set('API_VERSION', API_VERSION)
conf.set('VALA_API_VERSION', vala_version)
if jsonrpc_dep.found()
conf.set('JSONRPC', 'jsonrpc-glib-1.0')
else
conf.set('JSONRPC', '')
endif
configure_file(input : 'gvls.pc.in',
output : 'gvls-@0@.pc'.format(API_VERSION),
......@@ -124,7 +130,7 @@ LT_CURRENT='1'
LT_REVISION='0'
LT_AGE='0'
LT_VERSION='0'
lib = library('gvls', gvls_sources,
lib = library(VERSIONED_PROJECT_NAME, gvls_sources,
version : LT_VERSION,
soversion : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION,
vala_header : PROJECT_NAME+'.h',
......@@ -143,7 +149,7 @@ lib = library('gvls', gvls_sources,
install: true,
install_dir : [
true,
join_paths (get_option('includedir'), 'gvls-@0@'.format (API_VERSION)),
join_paths (get_option('includedir'), VERSIONED_PROJECT_NAME),
vapidir,
true
])
......
gio-2.0
gee-0.8
gtk-3.0
gtk+-3.0
gtksourceview-3.0
pango
gvls-0.10
gvls-@API_VERSION@
......@@ -4,10 +4,10 @@ libdir=@libdir@
datadir=@prefix@/share
includedir=@prefix@/include
Name: gvls
Description: GNOME Vala Language Server library
Name: gvlsui
Description: GNOME Vala Language Server GTK+ library
URL: https://gitlab.gnome.org/esodan/gvls
Version: @PROJECT_VERSION@
Requires: glib-2.0 >= 2.50 gio-2.0 >= 2.50 gobject-2.0 >= 2.50 gee-0.8 > 0.18
Libs: -L${libdir} -lgvls-@API_VERSION@
Requires: glib-2.0 >= 2.50 gio-2.0 >= 2.50 gobject-2.0 >= 2.50 gee-0.8 > 0.18 gvls-@API_VERSION@
Libs: -L${libdir} -lgvlsui-@API_VERSION@
Cflags: -I${includedir}/gvls-@API_VERSION@
......@@ -146,13 +146,15 @@ LT_CURRENT='1'
LT_REVISION='0'
LT_AGE='0'
LT_VERSION='0'
libui = library('gvlsui', gvlsui_sources,
libui = library(UI_VERSIONED_NAME, gvlsui_sources,
version : LT_VERSION,
soversion : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION,
vala_header : UI_PROJECT_NAME+'.h',
vala_vapi : UI_VAPI_NAME,
vala_gir : UI_GIR_NAME,
vala_args: '--target-glib=2.58',
vala_args: [
'--target-glib=2.58'
],
dependencies: [ gvlsui_deps, namespaceinfoui_dep],
c_args : [
'-include',
......@@ -161,7 +163,7 @@ libui = library('gvlsui', gvlsui_sources,
install: true,
install_dir : [
true,
join_paths (get_option('includedir'), UI_VERSIONED_NAME),
join_paths (get_option('includedir'), VERSIONED_PROJECT_NAME),
vapidir,
true
],
......
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