From 1e22120bb373a2cc274a8494b614577168241102 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 22 Jun 2011 03:00:09 +0000
Subject: Fix kdenetwork FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237924 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kopete/plugins/statistics/Makefile.am | 4 +---
 kopete/protocols/gadu/Makefile.am     | 7 -------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'kopete')

diff --git a/kopete/plugins/statistics/Makefile.am b/kopete/plugins/statistics/Makefile.am
index b6aa7812..35540a8d 100644
--- a/kopete/plugins/statistics/Makefile.am
+++ b/kopete/plugins/statistics/Makefile.am
@@ -2,14 +2,12 @@ METASOURCES = AUTO
 
 INCLUDES = $(KOPETE_INCLUDES) $(all_includes)
 
-SUBDIRS = sqlite
-
 kde_module_LTLIBRARIES = kopete_statistics.la
 
 kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
 
 kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
-kopete_statistics_la_LIBADD      = ../../libkopete/libkopete.la sqlite/libsqlite.la
+kopete_statistics_la_LIBADD      = ../../libkopete/libkopete.la
 
 service_DATA = kopete_statistics.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/protocols/gadu/Makefile.am b/kopete/protocols/gadu/Makefile.am
index d896950a..8d63dd80 100644
--- a/kopete/protocols/gadu/Makefile.am
+++ b/kopete/protocols/gadu/Makefile.am
@@ -1,14 +1,7 @@
 METASOURCES = AUTO
-if include_libggcopy
-LIBGADU_COPY=libgadu
-GG_INCLUDES=-Ilibgadu -I$(srcdir)/libgadu $(SSL_INCLUDES)
-GG_LIBS=$(top_builddir)/kopete/protocols/gadu/libgadu/libgadu_copy.la \
-	   $(LIBPTHREAD)
-else
 LIBGADU_COPY=
 GG_INCLUDES=$(LIBGG_INCLUDES)
 GG_LIBS=$(LIBGG_LIBS)
-endif
 
 
 SUBDIRS = ui icons $(LIBGADU_COPY)
-- 
cgit v1.2.1