summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-05-19 04:21:21 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-05-19 04:21:21 +0000
commit54272a84181a3910ae4687932e58ab9f59bcd758 (patch)
tree88669925c1f04f1be8dbf98bf8bf369b3b8c10e7
parentacc2b77512ce0d8d708dda14dec1464f3eed830c (diff)
downloadtdepim-54272a84.tar.gz
tdepim-54272a84.zip
Build fixes for Debian Lenny
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1128368 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kfile-plugins/ics/Makefile.am2
-rw-r--r--kfile-plugins/palm-databases/Makefile.am2
-rw-r--r--kfile-plugins/vcf/Makefile.am2
-rw-r--r--kpilot/conduits/abbrowserconduit/Makefile.am2
-rw-r--r--libkcal/Makefile.am6
-rw-r--r--libkdepim/Makefile.am4
-rw-r--r--libkdepim/kpartsdesignerplugin/Makefile.am2
7 files changed, 10 insertions, 10 deletions
diff --git a/kfile-plugins/ics/Makefile.am b/kfile-plugins/ics/Makefile.am
index 7ff0281c6..694f207f4 100644
--- a/kfile-plugins/ics/Makefile.am
+++ b/kfile-plugins/ics/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS = kfile_ics.h
kde_module_LTLIBRARIES = kfile_ics.la
kfile_ics_la_SOURCES = kfile_ics.cpp
-kfile_ics_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kfile_ics_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore
kfile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_KSYCOCA)
diff --git a/kfile-plugins/palm-databases/Makefile.am b/kfile-plugins/palm-databases/Makefile.am
index 43dbc7496..fa4ea63db 100644
--- a/kfile-plugins/palm-databases/Makefile.am
+++ b/kfile-plugins/palm-databases/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_palm.h
kde_module_LTLIBRARIES = kfile_palm.la
kfile_palm_la_SOURCES = kfile_palm.cpp
-kfile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
+kfile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore
kfile_palm_la_LIBADD = $(LIB_KSYCOCA) $(PISOCK_LIB)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/vcf/Makefile.am b/kfile-plugins/vcf/Makefile.am
index 5350fb1c1..e447e6faf 100644
--- a/kfile-plugins/vcf/Makefile.am
+++ b/kfile-plugins/vcf/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_vcf.h
kde_module_LTLIBRARIES = kfile_vcf.la
kfile_vcf_la_SOURCES = kfile_vcf.cpp
-kfile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kfile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore
kfile_vcf_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KABC)
# let automoc handle all of the meta source files (moc)
diff --git a/kpilot/conduits/abbrowserconduit/Makefile.am b/kpilot/conduits/abbrowserconduit/Makefile.am
index 6bb86c687..b012765ff 100644
--- a/kpilot/conduits/abbrowserconduit/Makefile.am
+++ b/kpilot/conduits/abbrowserconduit/Makefile.am
@@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \
abbrowser-setup.cc \
kabcRecord.cc \
abbrowser-conduit.cc
-conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkdecore -lkio -lkdeui
conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file
servicedir = $(kde_servicesdir)
diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am
index b35079d10..f76d32044 100644
--- a/libkcal/Makefile.am
+++ b/libkcal/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(srcdir)/versit -I$(top_srcdir)/ \
$(all_includes)
lib_LTLIBRARIES = libkcal.la
-libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0
+libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 $(LIB_QT) -lkdecore
libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \
-lical -licalss \
$(top_builddir)/ktnef/lib/libktnef.la \
@@ -50,11 +50,11 @@ libkcalinclude_HEADERS = alarm.h attachment.h attendee.h calendar.h \
kde_module_LTLIBRARIES = kcal_local.la kcal_localdir.la
kcal_local_la_SOURCES = resourcelocal_plugin.cpp
-kcal_local_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kcal_local_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore
kcal_local_la_LIBADD = libkcal.la
kcal_localdir_la_SOURCES = resourcelocaldir_plugin.cpp
-kcal_localdir_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kcal_localdir_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore
kcal_localdir_la_LIBADD = libkcal.la
EXTRA_PROGRAMS = convertqtopia
diff --git a/libkdepim/Makefile.am b/libkdepim/Makefile.am
index 925cad8a9..f2a4f11c8 100644
--- a/libkdepim/Makefile.am
+++ b/libkdepim/Makefile.am
@@ -42,7 +42,7 @@ MailTransportServiceIface_DIR = $(srcdir)/interfaces
AddressBookServiceIface_DIR = $(srcdir)/interfaces
-libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
+libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -lkdecore
libkdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libemailfunctions/libemailfunctions.la \
$(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) -lqui
@@ -52,7 +52,7 @@ include_HEADERS = kdepimmacros.h kpimprefs.h
AM_CXXFLAGS = -DQT_PLUGIN
kde_widget_LTLIBRARIES = kdepimwidgets.la
-kdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+kdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -lkdecore
kdepimwidgets_la_LIBADD = $(LIB_KIO) libkdepim.la
kdepimwidgets_la_SOURCES = kdepimwidgets.cpp
diff --git a/libkdepim/kpartsdesignerplugin/Makefile.am b/libkdepim/kpartsdesignerplugin/Makefile.am
index 08f1b7117..75f6e89d5 100644
--- a/libkdepim/kpartsdesignerplugin/Makefile.am
+++ b/libkdepim/kpartsdesignerplugin/Makefile.am
@@ -3,6 +3,6 @@ METASOURCES = AUTO
INCLUDES = $(all_includes)
kde_widget_LTLIBRARIES = kpartsdesignerplugin.la
-kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -lkdecore -lkio
kpartsdesignerplugin_la_LIBADD = $(LIB_KPARTS)
kpartsdesignerplugin_la_SOURCES = kpartsdesignerplugin.cpp