diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-16 17:31:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-16 17:31:31 -0600 |
| commit | a15448c070e58d41c8d7c6cde49d082a379f704b (patch) | |
| tree | f520d2df2d0097b252c7be393d30d31f80482172 /tdeabc | |
| parent | b747e48887ebd86a647f4f1b566464470064f784 (diff) | |
| download | tdelibs-a15448c070e58d41c8d7c6cde49d082a379f704b.tar.gz tdelibs-a15448c070e58d41c8d7c6cde49d082a379f704b.zip | |
Fix FTBFS
Diffstat (limited to 'tdeabc')
| -rw-r--r-- | tdeabc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeabc/Makefile.am | 18 | ||||
| -rw-r--r-- | tdeabc/tdeabc_manager.desktop (renamed from tdeabc/kabc_manager.desktop) | 0 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tdeabc/CMakeLists.txt b/tdeabc/CMakeLists.txt index e0ec832d0..0cd900c08 100644 --- a/tdeabc/CMakeLists.txt +++ b/tdeabc/CMakeLists.txt @@ -59,7 +59,7 @@ install( FILES ##### other data ################################ install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) -install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) +install( FILES tdeabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/tdeabc ) diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am index afdace9a9..a1f1d1b74 100644 --- a/tdeabc/Makefile.am +++ b/tdeabc/Makefile.am @@ -19,13 +19,13 @@ addressee.cpp addressee.h field.cpp: \ CLEANFILES = addressee.h addressee.cpp field.cpp -lib_LTLIBRARIES = libkabc.la -libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined -libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \ +lib_LTLIBRARIES = libtdeabc.la +libtdeabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined +libtdeabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \ $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) -libkabc_la_COMPILE_FIRST = addressee.h +libtdeabc_la_COMPILE_FIRST = addressee.h -libkabc_la_SOURCES = \ +libtdeabc_la_SOURCES = \ address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \ distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \ errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \ @@ -38,8 +38,8 @@ libkabc_la_SOURCES = \ sortmode.cpp -kabcincludedir = $(includedir)/tdeabc -kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ +tdeabcincludedir = $(includedir)/tdeabc +tdeabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \ errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \ phonenumber.h picture.h plugin.h resource.h \ @@ -53,13 +53,13 @@ METASOURCES = AUTO bin_PROGRAMS = tdeab2tdeabc tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la +tdeab2tdeabc_LDADD = libtdeabc.la ../kab/libkab.la tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp autostart_DATA = tdeab2tdeabc.desktop autostartdir = $(datadir)/autostart -manager_DATA = kabc_manager.desktop +manager_DATA = tdeabc_manager.desktop managerdir = $(kde_servicesdir)/tderesources DOXYGEN_REFERENCES = tdecore tdeui diff --git a/tdeabc/kabc_manager.desktop b/tdeabc/tdeabc_manager.desktop index 0af910f52..0af910f52 100644 --- a/tdeabc/kabc_manager.desktop +++ b/tdeabc/tdeabc_manager.desktop |