diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
| commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
| tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /korn | |
| parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
| download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'korn')
| -rw-r--r-- | korn/Makefile.am | 2 | ||||
| -rw-r--r-- | korn/kconf_update/Makefile.am | 2 | ||||
| -rw-r--r-- | korn/password.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/korn/Makefile.am b/korn/Makefile.am index 362e8606..39cc8ae5 100644 --- a/korn/Makefile.am +++ b/korn/Makefile.am @@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_RTTI) INCLUDES = -I$(top_srcdir)/libkmime \ $(all_includes) #INCLUDES = -I$(top_srcdir)/mimelib -I$(top_srcdir)/libkmime $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/korn/kconf_update/Makefile.am b/korn/kconf_update/Makefile.am index 3a5c028d..74991a93 100644 --- a/korn/kconf_update/Makefile.am +++ b/korn/kconf_update/Makefile.am @@ -8,5 +8,5 @@ kconf_PROGRAMS = korn-3-4-config_change kconfdir = $(libdir)/kconf_update_bin korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp -korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor korn_3_4_config_change_LDADD = $(LIB_QT) diff --git a/korn/password.cpp b/korn/password.cpp index 96622139..50f31e8d 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -21,7 +21,7 @@ #include <kconfig.h> #include <kdebug.h> -#include <kwallet.h> +#include <tdewallet.h> #include <tqstring.h> #include <tqstringlist.h> |