mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-07 22:02:12 +08:00
f0fb8148ba
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
32 lines
811 B
Makefile
32 lines
811 B
Makefile
# Global variables
|
|
|
|
src=$(abs_top_srcdir)
|
|
|
|
ASTYLERC="$(top_srcdir)/../astylerc"
|
|
indent="/usr/bin/astyle"
|
|
|
|
RING_DIRTY_REPO ?= $(shell git diff-index --quiet HEAD 2>/dev/null || echo dirty)
|
|
RING_REVISION ?= $(shell git log -1 --format="%h" --abbrev=10 2>/dev/null)
|
|
|
|
# Preprocessor flags
|
|
AM_CPPFLAGS += \
|
|
-I$(src)/src \
|
|
-I$(src)/src/config \
|
|
-I$(src)/src/media \
|
|
-I$(src)/test \
|
|
-I$(src)/src/dring \
|
|
$(SIP_CFLAGS) \
|
|
-DPREFIX=\"$(prefix)\" \
|
|
-DPROGSHAREDIR=\"$(datadir)/jami\" \
|
|
-DENABLE_TRACE \
|
|
-DRING_REVISION=\"$(RING_REVISION)\" \
|
|
-DRING_DIRTY_REPO=\"$(RING_DIRTY_REPO)\" \
|
|
-DPJSIP_MAX_PKT_LEN=8000 \
|
|
-DPJ_AUTOCONF=1
|
|
|
|
indent:
|
|
@echo "Indenting code:"
|
|
if [ -f $(ASTYLERC) ] ; then \
|
|
find $(top_srcdir)/src/ -name \*.cpp -o -name \*.h | xargs $(indent) --options=$(ASTYLERC) ; \
|
|
fi
|