[gnome-calendar] build: Make libgcal a static library
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] build: Make libgcal a static library
- Date: Sat, 4 May 2019 15:30:45 +0000 (UTC)
commit 70cb7c14a961676f28cb8a27bfdbbf83ce9d7a6a
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat May 4 12:28:45 2019 -0300
build: Make libgcal a static library
This avoids us building everything twice.
src/gcal-application.c | 3 +++
src/meson.build | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/gcal-application.c b/src/gcal-application.c
index f8a476b1..84bfd902 100644
--- a/src/gcal-application.c
+++ b/src/gcal-application.c
@@ -26,6 +26,7 @@
#include "gcal-context-private.h"
#include "gcal-debug.h"
#include "gcal-log.h"
+#include "gcal-resources.h"
#include "gcal-shell-search-provider.h"
#include "gcal-window.h"
@@ -606,6 +607,8 @@ gcal_application_init (GcalApplication *self)
{
GcalManager *manager;
+ g_resources_register (calendar_get_resource ());
+
g_application_add_main_option_entries (G_APPLICATION (self), gcal_application_goptions);
self->context = gcal_context_new ();
diff --git a/src/meson.build b/src/meson.build
index eb794f50..d1fe8210 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -129,7 +129,7 @@ calendar_incs += contrib_incs
# Private library #
###################
-libgcal = shared_library(
+libgcal = static_library(
'gcal-private',
sources: sources,
include_directories: calendar_incs,
@@ -150,9 +150,9 @@ libgcal_dep = declare_dependency(
executable(
meson.project_name(),
- sources + files('main.c'),
+ files('main.c'),
include_directories: calendar_incs,
- dependencies: gcal_deps,
+ dependencies: libgcal_dep,
install: true,
install_dir: calendar_bindir
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]