diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kabc/Makefile.am | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kabc/Makefile.am')
| -rw-r--r-- | kabc/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kabc/Makefile.am b/kabc/Makefile.am index c4aa489e7..ef989662f 100644 --- a/kabc/Makefile.am +++ b/kabc/Makefile.am @@ -22,7 +22,7 @@ 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) \ - $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) + $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) libkabc_la_COMPILE_FIRST = addressee.h libkabc_la_SOURCES = \ @@ -52,7 +52,7 @@ METASOURCES = AUTO bin_PROGRAMS = kab2kabc -kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kab2kabc_LDADD = libkabc.la ../kab/libkab.la kab2kabc_SOURCES = kab2kabc.cpp @@ -60,7 +60,7 @@ autostart_DATA = kab2kabc.desktop autostartdir = $(datadir)/autostart manager_DATA = kabc_manager.desktop -managerdir = $(kde_servicesdir)/kresources +managerdir = $(kde_servicesdir)/tderesources DOXYGEN_REFERENCES = tdecore tdeui |