merge PL and LIBTPL libs together

6 files changed, 10 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index b991678..75fa1d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,25 +157,15 @@ AC_SUBST(ERROR_CFLAGS)
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
 
-# Modules used by the library
-PKG_CHECK_MODULES(LIBTPL,
-[
-    gio-2.0
-    glib-2.0 >= $GLIB_REQUIRED
-    gobject-2.0
-    libxml-2.0
-    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-    sqlite3
-])
-
-# Modules used by the logger daemon
 PKG_CHECK_MODULES(TPL,
 [
    dbus-1 >= $DBUS_REQUIRED
    dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+   gio-2.0
    glib-2.0 >= $GLIB_REQUIRED
    gobject-2.0
    libxml-2.0
+   sqlite3
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
 ])
 
diff --git a/doc/reference/libtelepathy-logger/Makefile.am b/doc/reference/libtelepathy-logger/Makefile.am
index b9ab073..833adf8 100644
--- a/doc/reference/libtelepathy-logger/Makefile.am
+++ b/doc/reference/libtelepathy-logger/Makefile.am
@@ -95,9 +95,9 @@ expand_content_files=
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES= \
 	-I$(top_srcdir) -I$(top_builddir) \
-	$(LIBTPL_CFLAGS)
+	$(TPL_CFLAGS)
 GTKDOC_LIBS= \
-	$(LIBTPL_LIBS) \
+	$(TPL_LIBS) \
 	$(top_builddir)/telepathy-logger/libtelepathy-logger.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 72d9678..75d68ac 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = \
 
 noinst_LTLIBRARIES = libtpl-extensions-convenience.la
 libtpl_extensions_convenience_la_LIBADD = \
-    @LIBTPL_LIBS@
+    @TPL_LIBS@
 
 gen_headers = \
     _gen/cli-misc.h \
@@ -78,7 +78,7 @@ libtpl_extensions_la_LDFLAGS = \
     -version-info "$(TPL_EXT_LT_CURRENT)":"$(TPL_EXT_LT_REVISION)":"$(TPL_EXT_LT_AGE)"
 endif # ENABLE_PUBLIC_EXTENSIONS
 
-AM_CFLAGS = $(ERROR_CFLAGS) @LIBTPL_CFLAGS@
+AM_CFLAGS = $(ERROR_CFLAGS) @TPL_CFLAGS@
 
 # Generated stuff
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 19cf181..4e0ca5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ telepathy_logger_LDADD = \
 
 test_api_LDADD = \
 	$(top_builddir)/telepathy-logger/libtelepathy-logger.la \
-	$(LIBTPL_LIBS)
+	$(TPL_LIBS)
 
 
 check_c_sources = \
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index efcafc2..2e4a9ae 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS =						\
 	$(ERROR_CFLAGS)					\
 	-DG_LOG_DOMAIN=\"tp-logger\"			\
 	-DTPL_DATA_DIR=\"$(PACKAGE_NAME)\"		\
-	$(LIBTPL_CFLAGS)				\
+	$(TPL_CFLAGS)				\
 	$(DISABLE_DEPRECATED)				\
 	$(WARN_CFLAGS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 20af36a..fc82f01 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = $(CHECKTWISTED) suppressions
 
 LDADD = \
 	$(top_builddir)/telepathy-logger/libtelepathy-logger.la \
-	$(LIBTPL_LIBS)
+	$(TPL_LIBS)
 
 noinst_PROGRAMS = \
 	test-tpl-channel	\
@@ -32,7 +32,7 @@ test_searches_SOURCES = \
 
 AM_CFLAGS = \
 	$(ERROR_CFLAGS) \
-	$(LIBTPL_CFLAGS) \
+	$(TPL_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir)