From 5fbaba69567fec6978b2587fc1cd4fe66a9e6f80 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Feb 2013 17:55:55 -0600 Subject: Rename additional kabc files --- tdeabc/plugins/file/CMakeLists.txt | 10 +++++----- tdeabc/plugins/file/Makefile.am | 24 ++++++++++++------------ tdeabc/plugins/file/file.desktop | 2 +- tdeabc/plugins/file/resourcefileplugin.cpp | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tdeabc/plugins/file') diff --git a/tdeabc/plugins/file/CMakeLists.txt b/tdeabc/plugins/file/CMakeLists.txt index f5d5e2cdc..c7dbfef46 100644 --- a/tdeabc/plugins/file/CMakeLists.txt +++ b/tdeabc/plugins/file/CMakeLists.txt @@ -42,9 +42,9 @@ install( FILES install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_file (library) ####################### +##### tdeabc_file (library) ####################### -set( target kabc_file ) +set( target tdeabc_file ) set( ${target}_SRCS resourcefile.cpp resourcefileconfig.cpp @@ -58,9 +58,9 @@ tde_add_library( ${target} SHARED AUTOMOC ) -##### kabc_file (module) ######################## +##### tdeabc_file (module) ######################## -set( target kabc_file ) +set( target tdeabc_file ) set( ${target}_SRCS resourcefileplugin.cpp @@ -68,6 +68,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kabc_file-shared + LINK tdeabc_file-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am index bf85d8bd6..2df682794 100644 --- a/tdeabc/plugins/file/Makefile.am +++ b/tdeabc/plugins/file/Makefile.am @@ -3,18 +3,18 @@ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourcefileconfig.h -lib_LTLIBRARIES = libkabc_file.la -libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp -libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) -libkabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h - - -kde_module_LTLIBRARIES = kabc_file.la -kabc_file_la_SOURCES = resourcefileplugin.cpp -kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE) -kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h +lib_LTLIBRARIES = libtdeabc_file.la +libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp +libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) +libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + + +kde_module_LTLIBRARIES = tdeabc_file.la +tdeabc_file_la_SOURCES = resourcefileplugin.cpp +tdeabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined +tdeabc_file_la_LIBADD = libtdeabc_file.la $(LIB_QT) $(LIB_TDECORE) +tdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h METASOURCES = AUTO diff --git a/tdeabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop index 1359dd1c6..4c7991989 100644 --- a/tdeabc/plugins/file/file.desktop +++ b/tdeabc/plugins/file/file.desktop @@ -75,7 +75,7 @@ Name[wa]=Fitchî Name[zh_CN]=文件 Name[zh_HK]=檔案 Name[zh_TW]=檔案 -X-TDE-Library=kabc_file +X-TDE-Library=tdeabc_file Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp index 4dce19bc0..7c5b3359d 100644 --- a/tdeabc/plugins/file/resourcefileplugin.cpp +++ b/tdeabc/plugins/file/resourcefileplugin.cpp @@ -25,7 +25,7 @@ using namespace KABC; extern "C" { - KDE_EXPORT void *init_kabc_file() + KDE_EXPORT void *init_tdeabc_file() { return new KRES::PluginFactory(); } -- cgit v1.2.1