[gnome-calendar] project: don't install private library



commit 27a44c3092522e2516ded9bff7745249f7bb3207
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Sep 8 21:02:33 2017 -0300

    project: don't install private library
    
    Instead, bring back building all the objects into
    calendar itself, and only use the private library
    internally.

 meson.build       |    1 -
 src/meson.build   |   16 ++++++----------
 tests/meson.build |    4 +++-
 3 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/meson.build b/meson.build
index 18d2e41..5112921 100644
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,6 @@ calendar_micro_version = version_array[2].to_int()
 
 calendar_prefix = get_option('prefix')
 calendar_bindir = join_paths(calendar_prefix, get_option('bindir'))
-calendar_libdir = join_paths(calendar_prefix, get_option('libdir'))
 calendar_localedir = join_paths(calendar_prefix, get_option('localedir'))
 calendar_datadir = join_paths(calendar_prefix, get_option('datadir'))
 calendar_pkgdatadir = join_paths(calendar_datadir, meson.project_name())
diff --git a/src/meson.build b/src/meson.build
index 252fc2c..0291b3f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,7 +2,7 @@ src_inc = include_directories('.')
 
 enum_headers = files('gcal-utils.h')
 
-libgcal_deps = [
+gcal_deps = [
   gsettings_desktop_schemas_dep,
   libedataserverui_dep,
   libedataserver_dep,
@@ -119,12 +119,11 @@ incs += contrib_incs
 ###################
 
 libgcal = shared_library(
-               'gcal',
+               'gcal-private',
               sources: sources,
   include_directories: incs,
-         dependencies: libgcal_deps,
-              install: true,
-          install_dir: calendar_libdir
+         dependencies: gcal_deps,
+              install: false,
 )
 
 libgcal_dep = declare_dependency(
@@ -137,14 +136,11 @@ libgcal_dep = declare_dependency(
 # gnome-calendar #
 ##################
 
-calendar_deps = libgcal_deps
-calendar_deps += [ libgcal_dep ]
-
 executable(
   meson.project_name(),
-       files('main.c'),
+       sources + files('main.c'),
    include_directories: incs,
-          dependencies: calendar_deps,
+          dependencies: gcal_deps,
                install: true,
            install_dir: calendar_bindir
 )
diff --git a/tests/meson.build b/tests/meson.build
index c35fe37..6d02aae 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -3,6 +3,8 @@ test_incs = [
   src_inc
 ]
 
+tests_deps = gcal_deps + [ libgcal_dep ]
+
 ###########
 # Manager #
 ###########
@@ -10,7 +12,7 @@ test_incs = [
 test_manager = executable(
      'test-manager',
      'test-manager.c',
-         dependencies: calendar_deps,
+         dependencies: tests_deps,
   include_directories: test_incs
 )
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]