build: Make libgcal a static library
This avoids us building everything twice.
This commit is contained in:
@@ -26,6 +26,7 @@
|
|||||||
#include "gcal-context-private.h"
|
#include "gcal-context-private.h"
|
||||||
#include "gcal-debug.h"
|
#include "gcal-debug.h"
|
||||||
#include "gcal-log.h"
|
#include "gcal-log.h"
|
||||||
|
#include "gcal-resources.h"
|
||||||
#include "gcal-shell-search-provider.h"
|
#include "gcal-shell-search-provider.h"
|
||||||
#include "gcal-window.h"
|
#include "gcal-window.h"
|
||||||
|
|
||||||
@@ -606,6 +607,8 @@ gcal_application_init (GcalApplication *self)
|
|||||||
{
|
{
|
||||||
GcalManager *manager;
|
GcalManager *manager;
|
||||||
|
|
||||||
|
g_resources_register (calendar_get_resource ());
|
||||||
|
|
||||||
g_application_add_main_option_entries (G_APPLICATION (self), gcal_application_goptions);
|
g_application_add_main_option_entries (G_APPLICATION (self), gcal_application_goptions);
|
||||||
|
|
||||||
self->context = gcal_context_new ();
|
self->context = gcal_context_new ();
|
||||||
|
|||||||
+3
-3
@@ -129,7 +129,7 @@ calendar_incs += contrib_incs
|
|||||||
# Private library #
|
# Private library #
|
||||||
###################
|
###################
|
||||||
|
|
||||||
libgcal = shared_library(
|
libgcal = static_library(
|
||||||
'gcal-private',
|
'gcal-private',
|
||||||
sources: sources,
|
sources: sources,
|
||||||
include_directories: calendar_incs,
|
include_directories: calendar_incs,
|
||||||
@@ -150,9 +150,9 @@ libgcal_dep = declare_dependency(
|
|||||||
|
|
||||||
executable(
|
executable(
|
||||||
meson.project_name(),
|
meson.project_name(),
|
||||||
sources + files('main.c'),
|
files('main.c'),
|
||||||
include_directories: calendar_incs,
|
include_directories: calendar_incs,
|
||||||
dependencies: gcal_deps,
|
dependencies: libgcal_dep,
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: calendar_bindir
|
install_dir: calendar_bindir
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user