jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity
Files
f0fb8148ba7f453d73e31e1cece2dcffae68e878
jami-daemon/bin/dbus/Makefile.am

92 lines
2.5 KiB
Makefile
Raw Normal View History

build: Rename 'globals.mak' to 'globals.mk'. In GNU packages the '.mk' extension is commonly used for Makefile fragments. Moreover it allows Emacs to choose 'makefile-mode' automatically when opening it. Change-Id: Ia35e5471b6852226027f975395cd21834783674b Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
2016-11-06 13:58:51 +01:00
include $(top_srcdir)/globals.mk
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
client: split the dbus Makefile into generic parts Change-Id: Ic5ffa4329bb86e1a2208ab0e7e9d842e5d591c47 Refs: #46447
2014-04-28 18:48:28 -04:00
noinst_LTLIBRARIES = libclient_dbus.la
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
BUILT_SOURCES= \
Librarize daemon and create daemon app Refs:# 48032
2014-05-23 14:53:49 -04:00
dbuscallmanager.adaptor.h \
dbusconfigurationmanager.adaptor.h \
dbusinstance.adaptor.h
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
Librarize daemon and create daemon app Refs:# 48032
2014-05-23 14:53:49 -04:00
BUILT_SOURCES+=dbuspresencemanager.adaptor.h
Install D-Bus interface files in $(datadir)/dbus-1/interfaces - Rename D-Bus interface files according to the recommended scheme - Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified on the freedsektop website[1]. Installing interface files on the system will allow for compiling LRC without having to duplicate the D-Bus interface files. 1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd Tuleap: #688
2016-06-03 14:53:48 -04:00
dbuspresencemanager.adaptor.h: cx.ring.Ring.PresenceManager.xml Makefile.am
build: Enable the use of the dbusxx-xml2cpp tool built from contrib. Previously, the build machine would need to provide dbusxx-xml2cpp itself, while the library would be used from the contribs (always forced, as dbusxx-xml2cpp is unmaintained and slightly broken on newer GCCs). This change removes the requirement to have the dbus-c++ package installed on the build machine. Change-Id: I25ad2ee3e80afc33b320de9256b724a3c254f4fb
2021-03-09 23:23:57 -05:00
$(DBUSXX_XML2CPP) $< --adaptor=$@
* #31910: daemon: allow presence to be disabled at configure time
2013-10-16 16:14:07 -04:00
sources: rename to jami * rename namespace from ring to jami * rename logs methods from RING_* to JAMI_* * rename RING_VIDEO to ENABLE_VIDEO Change-Id: Ic98498652d7059fafe58a96220d565bcdfa53658
2019-04-02 17:10:48 -04:00
if ENABLE_VIDEO
Librarize daemon and create daemon app Refs:# 48032
2014-05-23 14:53:49 -04:00
BUILT_SOURCES+=dbusvideomanager.adaptor.h
Install D-Bus interface files in $(datadir)/dbus-1/interfaces - Rename D-Bus interface files according to the recommended scheme - Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified on the freedsektop website[1]. Installing interface files on the system will allow for compiling LRC without having to duplicate the D-Bus interface files. 1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd Tuleap: #688
2016-06-03 14:53:48 -04:00
dbusvideomanager.adaptor.h: cx.ring.Ring.VideoManager.xml Makefile.am
build: Enable the use of the dbusxx-xml2cpp tool built from contrib. Previously, the build machine would need to provide dbusxx-xml2cpp itself, while the library would be used from the contribs (always forced, as dbusxx-xml2cpp is unmaintained and slightly broken on newer GCCs). This change removes the requirement to have the dbus-c++ package installed on the build machine. Change-Id: I25ad2ee3e80afc33b320de9256b724a3c254f4fb
2021-03-09 23:23:57 -05:00
$(DBUSXX_XML2CPP) $< --adaptor=$@
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
endif
# Rule to generate the binding headers
Install D-Bus interface files in $(datadir)/dbus-1/interfaces - Rename D-Bus interface files according to the recommended scheme - Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified on the freedsektop website[1]. Installing interface files on the system will allow for compiling LRC without having to duplicate the D-Bus interface files. 1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd Tuleap: #688
2016-06-03 14:53:48 -04:00
dbuscallmanager.adaptor.h: cx.ring.Ring.CallManager.xml Makefile.am
build: Enable the use of the dbusxx-xml2cpp tool built from contrib. Previously, the build machine would need to provide dbusxx-xml2cpp itself, while the library would be used from the contribs (always forced, as dbusxx-xml2cpp is unmaintained and slightly broken on newer GCCs). This change removes the requirement to have the dbus-c++ package installed on the build machine. Change-Id: I25ad2ee3e80afc33b320de9256b724a3c254f4fb
2021-03-09 23:23:57 -05:00
$(DBUSXX_XML2CPP) $< --adaptor=$@
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
# Rule to generate the binding headers
Install D-Bus interface files in $(datadir)/dbus-1/interfaces - Rename D-Bus interface files according to the recommended scheme - Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified on the freedsektop website[1]. Installing interface files on the system will allow for compiling LRC without having to duplicate the D-Bus interface files. 1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd Tuleap: #688
2016-06-03 14:53:48 -04:00
dbusconfigurationmanager.adaptor.h: cx.ring.Ring.ConfigurationManager.xml Makefile.am
build: Enable the use of the dbusxx-xml2cpp tool built from contrib. Previously, the build machine would need to provide dbusxx-xml2cpp itself, while the library would be used from the contribs (always forced, as dbusxx-xml2cpp is unmaintained and slightly broken on newer GCCs). This change removes the requirement to have the dbus-c++ package installed on the build machine. Change-Id: I25ad2ee3e80afc33b320de9256b724a3c254f4fb
2021-03-09 23:23:57 -05:00
$(DBUSXX_XML2CPP) $< --adaptor=$@
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
# Rule to generate the binding headers
Install D-Bus interface files in $(datadir)/dbus-1/interfaces - Rename D-Bus interface files according to the recommended scheme - Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified on the freedsektop website[1]. Installing interface files on the system will allow for compiling LRC without having to duplicate the D-Bus interface files. 1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd Tuleap: #688
2016-06-03 14:53:48 -04:00
dbusinstance.adaptor.h: cx.ring.Ring.Instance.xml Makefile.am
build: Enable the use of the dbusxx-xml2cpp tool built from contrib. Previously, the build machine would need to provide dbusxx-xml2cpp itself, while the library would be used from the contribs (always forced, as dbusxx-xml2cpp is unmaintained and slightly broken on newer GCCs). This change removes the requirement to have the dbus-c++ package installed on the build machine. Change-Id: I25ad2ee3e80afc33b320de9256b724a3c254f4fb
2021-03-09 23:23:57 -05:00
$(DBUSXX_XML2CPP) $< --adaptor=$@
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
plugin: libarchive and plugins as default for linux fix preferences set in first plugin loading small logic changes in libraries loading related to: https://review.jami.net/c/ring-project/+/14433 Change-Id: I4730f279ee38d337e3ef94dd9562a5dfc1a63c32
2020-05-29 16:36:45 -04:00
if ENABLE_PLUGIN
plugin: add plugin to dbus interface Change-Id: I0bdffd53e9ba9463e3daacbc0641ab82e1ba89dd
2020-05-20 18:56:33 -04:00
BUILT_SOURCES+=dbuspluginmanagerinterface.adaptor.h
# Rule to generate the binding headers
dbuspluginmanagerinterface.adaptor.h: cx.ring.Ring.PluginManagerInterface.xml Makefile.am
build: Enable the use of the dbusxx-xml2cpp tool built from contrib. Previously, the build machine would need to provide dbusxx-xml2cpp itself, while the library would be used from the contribs (always forced, as dbusxx-xml2cpp is unmaintained and slightly broken on newer GCCs). This change removes the requirement to have the dbus-c++ package installed on the build machine. Change-Id: I25ad2ee3e80afc33b320de9256b724a3c254f4fb
2021-03-09 23:23:57 -05:00
$(DBUSXX_XML2CPP) $< --adaptor=$@
plugin: libarchive and plugins as default for linux fix preferences set in first plugin loading small logic changes in libraries loading related to: https://review.jami.net/c/ring-project/+/14433 Change-Id: I4730f279ee38d337e3ef94dd9562a5dfc1a63c32
2020-05-29 16:36:45 -04:00
endif
plugin: add plugin to dbus interface Change-Id: I0bdffd53e9ba9463e3daacbc0641ab82e1ba89dd
2020-05-20 18:56:33 -04:00
client: split the dbus Makefile into generic parts Change-Id: Ic5ffa4329bb86e1a2208ab0e7e9d842e5d591c47 Refs: #46447
2014-04-28 18:48:28 -04:00
libclient_dbus_la_SOURCES = \
Librarize daemon and create daemon app Refs:# 48032
2014-05-23 14:53:49 -04:00
dbuscallmanager.cpp \
daemon: fix make distcheck Refs #56397 Change-Id: Ide0b812404d49a75ccbe2df675a84a513d57b936
2014-09-30 00:07:59 -04:00
dbuscallmanager.h \
Librarize daemon and create daemon app Refs:# 48032
2014-05-23 14:53:49 -04:00
dbusconfigurationmanager.cpp \
daemon: fix make distcheck Refs #56397 Change-Id: Ide0b812404d49a75ccbe2df675a84a513d57b936
2014-09-30 00:07:59 -04:00
dbusconfigurationmanager.h \
Librarize daemon and create daemon app Refs:# 48032
2014-05-23 14:53:49 -04:00
dbusinstance.cpp \
dbusclient.cpp \
daemon: fix make distcheck Refs #56397 Change-Id: Ide0b812404d49a75ccbe2df675a84a513d57b936
2014-09-30 00:07:59 -04:00
dbusclient.h \
daemon: remove --disable-presence Refs #60980 Change-Id: I90a83422acc829bc9262594290db71e10799b343
2014-11-20 17:39:13 -05:00
dbusinstance.h \
dbus_cpp.h \
dbuspresencemanager.cpp \
dbuspresencemanager.h \
$(BUILT_SOURCES)
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
plugin: libarchive and plugins as default for linux fix preferences set in first plugin loading small logic changes in libraries loading related to: https://review.jami.net/c/ring-project/+/14433 Change-Id: I4730f279ee38d337e3ef94dd9562a5dfc1a63c32
2020-05-29 16:36:45 -04:00
if ENABLE_PLUGIN
libclient_dbus_la_SOURCES += dbuspluginmanagerinterface.cpp dbuspluginmanagerinterface.h
endif
sources: rename to jami * rename namespace from ring to jami * rename logs methods from RING_* to JAMI_* * rename RING_VIDEO to ENABLE_VIDEO Change-Id: Ic98498652d7059fafe58a96220d565bcdfa53658
2019-04-02 17:10:48 -04:00
if ENABLE_VIDEO
daemon: fix make distcheck Refs #56397 Change-Id: Ide0b812404d49a75ccbe2df675a84a513d57b936
2014-09-30 00:07:59 -04:00
libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
endif
daemon: Use the PROGSHAREDIR macro to refer to the custom datadir. The sources previously hard-coded the location of the default Jami ringtone as "/usr/share/ring/ringtones/default.opus". It should instead be computed from the already existing PROGSHAREDIR macro, which is built from Autoconf's configurable datadir. * globals.mk (-DPROGSHAREDIR): Rename the 'ring' subdirectory to 'jami'. * meson.build (conf): Likewise. * ringtones/Makefile.am (dist_jamiringtones_DATA): s/ring/jami/g * ringtones/meson.build: Likewise. * src/account.cpp (DEFAULT_RINGTONE_PATH): Define in terms of PROGSHAREDIR. * bin/dbus/Makefile.am (libclient_dbus_la_CXXFLAGS): Remove extraneous flags, already propagated via AM_CPPFLAGS. Honor AM_CXXFLAGS. * src/client/Makefile.am (libclient_la_CXXFLAGS): Remove. * src/plugin/Makefile.am (libplugin_la_CXXFLAGS): Likewise. Change-Id: Icaa0a92e896f86b0bb07f82e4079570db08fafbd
2021-06-21 13:36:34 -04:00
libclient_dbus_la_CXXFLAGS = $(AM_CXXFLAGS) $(DBUSCPP_CFLAGS)
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
daemon: Install dring to libexec and edit templates at install time. Executables are typically installed under bin/, sbin/ or libexec, rather than lib/. The problem was noticed when trying to use Jami with a Guix relocatable pack, which only wraps executables found under the above locations. Since dring is a daemon and should not be run directly by users under normal circumstances, the convention is to use the libexec directory, according to the File Hierchy Standard 3.0. Also tackled in this change is the substitution of the Autoconf variables at installation time rather than configuration time, as per the GNU Coding Standards. The following solution is taken from https://github.com/gentoo/eudev/pull/183/commits, which in turn is adapted from the Autoconf manual (c.f.: info "(autoconf)Installation Directory Variables"). * bin/Makefile.am (ringlibdir): Delete variable. * bin/dbus/Makefile.am (do_subst): New variable. (cx.ring.Ring.service): Derive from the cx.ring.Ring.service.in template. [HAVE_WIN32]: (ringlib_PROGRAMS): Rename to ... (bin_PROGRAMS): ... this. [HAVE_OSX, RING_DBUS]: Likewise. * bin/dbus/cx.ring.Ring.service.in (Exec): Adust. * globals.mk (ringlibdir): Delete variable. * configure.ac [with_dbus] <AC_CONFIG_FILES>: Remove bin/dbus/cx.ring.Ring.service. Also remove the LIBDIR variable, no longer used. Fix indentation. Thanks to Vladimir Stoiakin for providing feedback on this change. Change-Id: I845bf2bd590a9457e70ca173027217b8f164d713
2021-03-31 22:05:43 -04:00
do_subst = $(SED) \
-e 's,[@]bindir[@],$(bindir),g'
cx.ring.Ring.service: cx.ring.Ring.service.in Makefile
$(do_subst) < $< > $@
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
# Dbus service file
servicedir = $(datadir)/dbus-1/services
deamon: rename to Ring Refs #62691 Change-Id: I8b051e38674b50d2b7771376310dcf9d964452b4
2015-01-08 15:43:13 -05:00
service_DATA = cx.ring.Ring.service
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
Install D-Bus interface files in $(datadir)/dbus-1/interfaces - Rename D-Bus interface files according to the recommended scheme - Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified on the freedsektop website[1]. Installing interface files on the system will allow for compiling LRC without having to duplicate the D-Bus interface files. 1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd Tuleap: #688
2016-06-03 14:53:48 -04:00
# Dbus interface files
# https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files
interfacedir = $(datadir)/dbus-1/interfaces
interface_DATA = cx.ring.Ring.CallManager.xml \
cx.ring.Ring.ConfigurationManager.xml \
cx.ring.Ring.Instance.xml \
plugin: libarchive and plugins as default for linux fix preferences set in first plugin loading small logic changes in libraries loading related to: https://review.jami.net/c/ring-project/+/14433 Change-Id: I4730f279ee38d337e3ef94dd9562a5dfc1a63c32
2020-05-29 16:36:45 -04:00
cx.ring.Ring.PresenceManager.xml
if ENABLE_PLUGIN
interface_DATA += cx.ring.Ring.PluginManagerInterface.xml
endif
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
sources: rename to jami * rename namespace from ring to jami * rename logs methods from RING_* to JAMI_* * rename RING_VIDEO to ENABLE_VIDEO Change-Id: Ic98498652d7059fafe58a96220d565bcdfa53658
2019-04-02 17:10:48 -04:00
if ENABLE_VIDEO
Install D-Bus interface files in $(datadir)/dbus-1/interfaces - Rename D-Bus interface files according to the recommended scheme - Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified on the freedsektop website[1]. Installing interface files on the system will allow for compiling LRC without having to duplicate the D-Bus interface files. 1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd Tuleap: #688
2016-06-03 14:53:48 -04:00
interface_DATA += cx.ring.Ring.VideoManager.xml
* #26839: dbus: move into client/dbus
2013-07-16 15:01:17 -04:00
endif
CLEANFILES= \
$(BUILT_SOURCES) \
deamon: rename to Ring Refs #62691 Change-Id: I8b051e38674b50d2b7771376310dcf9d964452b4
2015-01-08 15:43:13 -05:00
cx.ring.Ring.service
Reference in New Issue Copy Permalink