Skip to content

Commit cd7975d

Browse files
committed
build: Remove -dev package, don't install csd-enums, don't generate
a pkgconfig file, make libcsd static. Nothing uses csd components outside of csd, there's no need for a .pc file or public headers.
1 parent 88c6320 commit cd7975d

File tree

5 files changed

+3
-35
lines changed

5 files changed

+3
-35
lines changed

cinnamon-settings-daemon/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if using_logind
1515
csd_deps += logind
1616
endif
1717

18-
csd_lib = library(
18+
csd_lib = static_library(
1919
'csd',
2020
csd_sources,
2121
include_directories: include_dirs,

data/meson.build

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
1-
pkg_api = 'cinnamon-settings-daemon-3.0'
2-
proj_name = meson.project_name()
3-
4-
enums_header = [
5-
'csd-enums.h',
6-
]
7-
81
include_enums = include_directories('.')
92

10-
install_headers(
11-
enums_header,
12-
subdir: join_paths(pkg_api, proj_name),
13-
)
14-
153
mkenums = gnome.mkenums(
164
'org.cinnamon.settings-daemon.enums.xml',
17-
sources: enums_header,
5+
sources: ['csd-enums.h'],
186
comments: '<!-- @comment@ -->',
197
fhead: '<schemalist>',
208
vhead: ' <@type@ id=\'org.cinnamon.settings-daemon.@EnumName@\'>',
@@ -38,7 +26,7 @@ schemas = [
3826
]
3927

4028
schema_conf = configuration_data()
41-
schema_conf.set('GETTEXT_PACKAGE', proj_name)
29+
schema_conf.set('GETTEXT_PACKAGE', meson.project_name())
4230

4331
foreach schema : schemas
4432
configure_file(
@@ -49,9 +37,3 @@ foreach schema : schemas
4937
)
5038
endforeach
5139

52-
pkg.generate(
53-
name: proj_name,
54-
description: 'cinnamon-settings-daemon specific enumarations',
55-
subdirs: pkg_api,
56-
requires: 'glib-2.0',
57-
)

debian/cinnamon-settings-daemon-dev.install

Lines changed: 0 additions & 2 deletions
This file was deleted.

debian/cinnamon-settings-daemon.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
etc/xdg/autostart/*
22
usr/bin
3-
usr/lib/*/cinnamon-settings-daemon*/*.so
43
usr/lib/*/cinnamon-settings-daemon/
54
usr/libexec
65
usr/share/applications/*

debian/control

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,6 @@ Description: daemon handling the Cinnamon session settings
5353
It also sets various application settings through X resources and
5454
freedesktop.org XSETTINGS.
5555

56-
Package: cinnamon-settings-daemon-dev
57-
Architecture: any
58-
Depends:
59-
libglib2.0-dev (>= 2.26.0),
60-
${misc:Depends},
61-
${shlibs:Depends},
62-
Multi-Arch: same
63-
Description: Headers for building applications communicating with cinnamon-settings-daemon
64-
This package contains header files required to build applications that
65-
communicate with the Cinnamon settings daemon over D-Bus.
66-
6756
Package: cinnamon-settings-daemon-dbg
6857
Section: debug
6958
Priority: extra

0 commit comments

Comments
 (0)