From ea327ff28eaca970c9cb8e62fca82ad9894a71f8 Mon Sep 17 00:00:00 2001
From: Olivier Dion <olivier.dion@savoirfairelinux.com>
Date: Fri, 2 Sep 2022 14:38:25 -0400
Subject: [PATCH] Rename libring to libjami
Change-Id: Id123f733759d6147f0f8fb9975b21fd8b0f1e558
---
README | 2 +-
bin/Makefile.am | 6 +++---
bin/dbus/dbusclient.cpp | 2 +-
configure.ac | 2 +-
src/Makefile.am | 26 ++++++++++++------------
src/client/Makefile.am | 2 +-
src/config/Makefile.am | 2 +-
src/im/Makefile.am | 2 +-
src/jamidht/Makefile.am | 10 ++++-----
src/jamidht/eth/libdevcore/Makefile.am | 2 +-
src/jamidht/eth/libdevcrypto/Makefile.am | 2 +-
src/media/Makefile.am | 2 +-
src/plugin/Makefile.am | 2 +-
src/security/Makefile.am | 2 +-
src/sip/Makefile.am | 2 +-
src/upnp/Makefile.am | 2 +-
test/agent/Makefile.am | 2 +-
test/fuzzing/Makefile.am | 2 +-
test/unitTest/Makefile.am | 2 +-
19 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/README b/README
index c20e3377e1..d84c47ef27 100644
--- a/README
+++ b/README
@@ -154,7 +154,7 @@ cd ../../
./configure --without-dbus --prefix=<install_path>
make
-If you want to link against libringclient and native client easiest way is to
+If you want to link against libjamiclient and native client easiest way is to
add to ./configure: --prefix=<prefix_path>
Do a little dance!
diff --git a/bin/Makefile.am b/bin/Makefile.am
index b6599e8ac1..e1917da0cd 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -5,7 +5,7 @@ jamid_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/jami \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
$(AM_CXXFLAGS)
-jamid_LDADD = $(top_builddir)/src/libring.la
+jamid_LDADD = $(top_builddir)/src/libjami.la
endif
if HAVE_OSX
@@ -15,7 +15,7 @@ jamid_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/jami \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
$(AM_CXXFLAGS)
-jamid_LDADD = $(top_builddir)/src/libring.la
+jamid_LDADD = $(top_builddir)/src/libjami.la
endif
SUBDIRS=
@@ -31,7 +31,7 @@ jamid_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
-I$(top_srcdir)/src/jami \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
-jamid_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la -ldl
+jamid_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libjami.la -ldl
endif
if ENABLE_NODEJS
diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp
index 5eac7e2094..1f822c24c4 100644
--- a/bin/dbus/dbusclient.cpp
+++ b/bin/dbus/dbusclient.cpp
@@ -106,7 +106,7 @@ DBusClient::DBusClient(int flags, bool persistent)
}
if (initLibrary(flags) < 0)
- throw std::runtime_error {"cannot initialize libring"};
+ throw std::runtime_error {"cannot initialize libjami"};
instanceManager_->started();
}
diff --git a/configure.ac b/configure.ac
index dcdb75c4af..17c82abb7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,7 +217,7 @@ AC_COMPILE_IFELSE(
AC_MSG_RESULT([$CLANG])
-dnl define DRING_BUILD because we are building libring, not using it
+dnl define DRING_BUILD because we are building libjami, not using it
dnl if building shared library, define jami_EXPORTS
AC_MSG_CHECKING([if compiling shared library])
DAEMONCPPFLAGS+=" -fvisibility=hidden -DDRING_BUILD"
diff --git a/src/Makefile.am b/src/Makefile.am
index 95bfbb0c10..273c63182a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,8 +8,8 @@ noinst_LTLIBRARIES=
noinst_HEADERS=
nobase_include_HEADERS=
-lib_LTLIBRARIES = libring.la
-libring_la_LIBADD=
+lib_LTLIBRARIES = libjami.la
+libjami_la_LIBADD=
include ./client/Makefile.am
include ./media/Makefile.am
@@ -21,9 +21,9 @@ include ./jamidht/Makefile.am
include ./im/Makefile.am
include ./plugin/Makefile.am
-# libring
+# libjami
-libring_la_LIBADD += \
+libjami_la_LIBADD += \
$(ALSA_LIBS) \
$(PULSEAUDIO_LIBS) \
$(PORTAUDIO_LIBS) \
@@ -52,27 +52,27 @@ libring_la_LIBADD += \
if ENABLE_PLUGIN
if HAVE_OSX
-libring_la_LIBADD += $(MINIZIP_LIBS)
+libjami_la_LIBADD += $(MINIZIP_LIBS)
else
-libring_la_LIBADD += $(ARCHIVE_LIBS)
+libjami_la_LIBADD += $(ARCHIVE_LIBS)
endif
endif
# XXX: It seems this should be the default value when otherwise left
# unspecified, but for some reason this is required otherwise the
# shared object fails to link against ffmpeg's libswscale.a.
-libring_la_LDFLAGS = $(AM_LDFLAGS)
+libjami_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_WIN32
-libring_la_LDFLAGS += -no-undefined -avoid-version
+libjami_la_LDFLAGS += -no-undefined -avoid-version
endif
if HAVE_OSX
#FIXME necessary for -lintl
-libring_la_LDFLAGS += -L/usr/local/opt/gettext/lib
+libjami_la_LDFLAGS += -L/usr/local/opt/gettext/lib
endif
-libring_la_SOURCES = \
+libjami_la_SOURCES = \
buildinfo.cpp \
conference.cpp \
conference_protocol.cpp \
@@ -136,7 +136,7 @@ libring_la_SOURCES = \
vcard.h
if HAVE_WIN32
-libring_la_SOURCES += \
+libjami_la_SOURCES += \
dlfcn.c \
winsyslog.c
endif
@@ -166,6 +166,6 @@ nobase_include_HEADERS += \
endif
if ENABLE_TRACEPOINTS
-libring_la_SOURCES += jami/tracepoint.h jami/tracepoint-def.h jami/tracepoint.c
-libring_la_LIBADD += $(LTTNG_LIBS)
+libjami_la_SOURCES += jami/tracepoint.h jami/tracepoint-def.h jami/tracepoint.c
+libjami_la_LIBADD += $(LTTNG_LIBS)
endif
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 6a871cb50f..fc51caa80e 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -22,4 +22,4 @@ libclient_la_SOURCES = \
$(PRESENCE_SRC) \
$(VIDEO_SRC)
-libring_la_LIBADD += libclient.la
+libjami_la_LIBADD += libclient.la
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 06d9a02c91..03aa405825 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -5,4 +5,4 @@ libconfig_la_SOURCES = \
./config/yamlparser.h \
./config/yamlparser.cpp
-libring_la_LIBADD += libconfig.la
+libjami_la_LIBADD += libconfig.la
diff --git a/src/im/Makefile.am b/src/im/Makefile.am
index deb07f372a..a86fe69b65 100644
--- a/src/im/Makefile.am
+++ b/src/im/Makefile.am
@@ -6,4 +6,4 @@ libim_la_SOURCES = \
./im/instant_messaging.h \
./im/message_engine.h
-libring_la_LIBADD += libim.la
+libjami_la_LIBADD += libim.la
diff --git a/src/jamidht/Makefile.am b/src/jamidht/Makefile.am
index 4ab94e574a..79fe3a35a5 100644
--- a/src/jamidht/Makefile.am
+++ b/src/jamidht/Makefile.am
@@ -1,10 +1,10 @@
-noinst_LTLIBRARIES += libringacc.la
+noinst_LTLIBRARIES += libjamiacc.la
-libringacc_la_LIBADD=
+libjamiacc_la_LIBADD=
AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth
-libringacc_la_SOURCES = \
+libjamiacc_la_SOURCES = \
./jamidht/abstract_sip_transport.h \
./jamidht/jamiaccount.cpp \
./jamidht/jamiaccount.h \
@@ -48,7 +48,7 @@ libringacc_la_SOURCES = \
./jamidht/transfer_channel_handler.cpp
if RINGNS
-libringacc_la_SOURCES += \
+libjamiacc_la_SOURCES += \
./jamidht/namedirectory.cpp \
./jamidht/namedirectory.h
endif
@@ -56,4 +56,4 @@ endif
include ./jamidht/eth/libdevcore/Makefile.am
include ./jamidht/eth/libdevcrypto/Makefile.am
-libring_la_LIBADD += libringacc.la
+libjami_la_LIBADD += libjamiacc.la
diff --git a/src/jamidht/eth/libdevcore/Makefile.am b/src/jamidht/eth/libdevcore/Makefile.am
index d78f50fc86..eaf34f74e4 100644
--- a/src/jamidht/eth/libdevcore/Makefile.am
+++ b/src/jamidht/eth/libdevcore/Makefile.am
@@ -13,4 +13,4 @@ noinst_HEADERS += \
./jamidht/eth/libdevcore/CommonData.h \
./jamidht/eth/libdevcore/Address.h
-libringacc_la_LIBADD += libdevcore.la
+libjamiacc_la_LIBADD += libdevcore.la
diff --git a/src/jamidht/eth/libdevcrypto/Makefile.am b/src/jamidht/eth/libdevcrypto/Makefile.am
index 4d58a63fc3..a86674bbe7 100644
--- a/src/jamidht/eth/libdevcrypto/Makefile.am
+++ b/src/jamidht/eth/libdevcrypto/Makefile.am
@@ -3,4 +3,4 @@ noinst_LTLIBRARIES += libdevcrypto.la
libdevcrypto_la_SOURCES = ./jamidht/eth/libdevcrypto/Common.cpp
noinst_HEADERS += ./jamidht/eth/libdevcrypto/Common.h
-libringacc_la_LIBADD += libdevcrypto.la
+libjamiacc_la_LIBADD += libdevcrypto.la
diff --git a/src/media/Makefile.am b/src/media/Makefile.am
index 35d1bf8ff5..b5d4e5f733 100644
--- a/src/media/Makefile.am
+++ b/src/media/Makefile.am
@@ -47,4 +47,4 @@ noinst_HEADERS += \
include ./media/audio/Makefile.am
include ./media/video/Makefile.am
-libring_la_LIBADD += libmedia.la
+libjami_la_LIBADD += libmedia.la
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 567640cd00..2bb486bf22 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -30,6 +30,6 @@ libplugin_la_SOURCES = \
./plugin/callservicesmanager.cpp \
./plugin/preferenceservicesmanager.cpp
-libring_la_LIBADD += libplugin.la
+libjami_la_LIBADD += libplugin.la
endif
diff --git a/src/security/Makefile.am b/src/security/Makefile.am
index b881265d4b..ccaa114558 100644
--- a/src/security/Makefile.am
+++ b/src/security/Makefile.am
@@ -14,4 +14,4 @@ libsecurity_la_SOURCES = \
./security/diffie-hellman.cpp \
./security/diffie-hellman.h
-libring_la_LIBADD += libsecurity.la
+libjami_la_LIBADD += libsecurity.la
diff --git a/src/sip/Makefile.am b/src/sip/Makefile.am
index 2a09a1d866..fee0b0918f 100644
--- a/src/sip/Makefile.am
+++ b/src/sip/Makefile.am
@@ -26,4 +26,4 @@ libsiplink_la_SOURCES = \
./sip/sdes_negotiator.cpp \
./sip/sdes_negotiator.h
-libring_la_LIBADD += libsiplink.la
+libjami_la_LIBADD += libsiplink.la
diff --git a/src/upnp/Makefile.am b/src/upnp/Makefile.am
index 51bec6700c..db133eb7dc 100644
--- a/src/upnp/Makefile.am
+++ b/src/upnp/Makefile.am
@@ -10,4 +10,4 @@ libupnpcontrol_la_SOURCES = \
include ./upnp/protocol/Makefile.am
-libring_la_LIBADD += libupnpcontrol.la
+libjami_la_LIBADD += libupnpcontrol.la
diff --git a/test/agent/Makefile.am b/test/agent/Makefile.am
index b5a492d67b..c2e7672ce2 100644
--- a/test/agent/Makefile.am
+++ b/test/agent/Makefile.am
@@ -24,7 +24,7 @@ libguile_jami_la_SOURCES = \
src/bindings/signal.cpp \
src/bindings/signal.h
-libguile_jami_la_LIBADD = $(top_builddir)/src/libring.la
+libguile_jami_la_LIBADD = $(top_builddir)/src/libjami.la
MODULES = \
agent.scm \
diff --git a/test/fuzzing/Makefile.am b/test/fuzzing/Makefile.am
index ed7a83c9c5..3208e68e66 100644
--- a/test/fuzzing/Makefile.am
+++ b/test/fuzzing/Makefile.am
@@ -6,7 +6,7 @@ if ENABLE_FUZZING
flex --outfile $@ $^
AM_CXXFLAGS += -I$(top_srcdir)/src -I. -include common.h
-AM_LDFLAGS += $(top_builddir)/src/libring.la
+AM_LDFLAGS += $(top_builddir)/src/libjami.la
check_PROGRAMS =
lib_LTLIBRARIES = libfuzz.la
diff --git a/test/unitTest/Makefile.am b/test/unitTest/Makefile.am
index 9ab7208440..f2b0fd9948 100644
--- a/test/unitTest/Makefile.am
+++ b/test/unitTest/Makefile.am
@@ -8,7 +8,7 @@ AM_TESTS_ENVIRONMENT = \
# The unit tests require hidden symbols. Thus, we link the tests
# against a static version of libjami instead.
AM_CXXFLAGS += -I$(top_srcdir)/src
-AM_LDFLAGS += $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la -static
+AM_LDFLAGS += $(CPPUNIT_LIBS) $(top_builddir)/src/libjami.la -static
check_PROGRAMS =
####### Unit Test ########
--
GitLab