diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 02:31:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 02:31:40 -0600 |
| commit | 513d0163e99d4447deb274b9f0799bb390f26cfc (patch) | |
| tree | 7686847bc46ef657e8d278a4a342e21d0a1edb80 /tderesources/carddav | |
| parent | 10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5 (diff) | |
| download | tdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.tar.gz tdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.zip | |
Fix FTBFS
Diffstat (limited to 'tderesources/carddav')
| -rw-r--r-- | tderesources/carddav/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tderesources/carddav/Makefile.am | 24 | ||||
| -rw-r--r-- | tderesources/carddav/tdeabc_carddav.desktop | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/tderesources/carddav/CMakeLists.txt b/tderesources/carddav/CMakeLists.txt index 491ea2ae9..11e139a2e 100644 --- a/tderesources/carddav/CMakeLists.txt +++ b/tderesources/carddav/CMakeLists.txt @@ -29,22 +29,22 @@ link_directories( ##### other data ################################ install( - FILES kabc_carddav.desktop + FILES tdeabc_carddav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_carddav (module) ##################### +##### tdeabc_carddav (module) ##################### -tde_add_kpart( kabc_carddav AUTOMOC +tde_add_kpart( tdeabc_carddav AUTOMOC SOURCES plugin.cpp - LINK kabc_carddav-shared + LINK tdeabc_carddav-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kabc_carddav (shared) ##################### +##### tdeabc_carddav (shared) ##################### -tde_add_library( kabc_carddav SHARED AUTOMOC +tde_add_library( tdeabc_carddav SHARED AUTOMOC SOURCES resource.cpp config.cpp configwidgets.cpp preferences.cpp job.cpp reader.cpp writer.cpp prefsskel.kcfgc diff --git a/tderesources/carddav/Makefile.am b/tderesources/carddav/Makefile.am index 3b47f2abb..ff63306dc 100644 --- a/tderesources/carddav/Makefile.am +++ b/tderesources/carddav/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = libkabc_carddav.la +lib_LTLIBRARIES = libtdeabc_carddav.la -libkabc_carddav_la_SOURCES = resource.cpp \ +libtdeabc_carddav_la_SOURCES = resource.cpp \ config.cpp \ configwidgets.cpp \ preferences.cpp \ @@ -10,24 +10,24 @@ libkabc_carddav_la_SOURCES = resource.cpp \ reader.cpp \ writer.cpp \ prefsskel.kcfgc -libkabc_carddav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ +libtdeabc_carddav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined -libkabc_carddav_la_LIBADD = \ +libtdeabc_carddav_la_LIBADD = \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la \ -lkabc \ -lcarddav -libkabc_carddav_la_COMPILE_FIRST = prefsskel.h +libtdeabc_carddav_la_COMPILE_FIRST = prefsskel.h -kde_module_LTLIBRARIES = kabc_carddav.la +kde_module_LTLIBRARIES = tdeabc_carddav.la -kabc_carddav_la_SOURCES = plugin.cpp -kabc_carddav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) -kabc_carddav_la_LIBADD = libkabc_carddav.la -kabc_carddav_la_COMPILE_FIRST = prefsskel.h +tdeabc_carddav_la_SOURCES = plugin.cpp +tdeabc_carddav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) +tdeabc_carddav_la_LIBADD = libtdeabc_carddav.la +tdeabc_carddav_la_COMPILE_FIRST = prefsskel.h -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_carddav.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_carddav.desktop METASOURCES = AUTO diff --git a/tderesources/carddav/tdeabc_carddav.desktop b/tderesources/carddav/tdeabc_carddav.desktop index 585d11b36..6be73bd00 100644 --- a/tderesources/carddav/tdeabc_carddav.desktop +++ b/tderesources/carddav/tdeabc_carddav.desktop @@ -45,7 +45,7 @@ Name[tr]=CardDAV Sunucusu (ör. Zimbra Contacts) Name[uk]=Сервер CardDAV (напр., Zimbra Contacts) Name[zh_CN]=CardDAV 服务器(如 Zimbra Contacts) Name[zh_TW]=CardDAV 伺服器 (如: Zimbra Contacts) -X-TDE-Library=kabc_carddav +X-TDE-Library=tdeabc_carddav Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact |