diff options
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| -rw-r--r-- | src/kile.kdevprj | 2 | ||||
| -rw-r--r-- | src/kile/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/kile/Makefile.am | 2 | ||||
| -rw-r--r-- | src/kile/symbols/CMakeLists.txt | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 57d20e5..048e9cf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2088,8 +2088,8 @@ if test $kde_qtver = 3; then *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") @@ -2098,9 +2098,9 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") @@ -2109,8 +2109,8 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_SMB, "-lsmb") @@ -2119,13 +2119,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/src/kile.kdevprj b/src/kile.kdevprj index db395a2..b88255b 100644 --- a/src/kile.kdevprj +++ b/src/kile.kdevprj @@ -22,7 +22,7 @@ bin_program=kile cflags=-pg -a cppflags= cxxflags=\s-O0 -g3 -Wall -ldadd=-ltdeprint $(LIB_KSPELL) $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +ldadd=-ltdeprint $(LIB_KSPELL) $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags=\s \s [General] diff --git a/src/kile/CMakeLists.txt b/src/kile/CMakeLists.txt index c951082..9d63048 100644 --- a/src/kile/CMakeLists.txt +++ b/src/kile/CMakeLists.txt @@ -148,7 +148,7 @@ KDE3_ADD_KCFG_FILES(kile_SRCS ${kile_KCFG_SRCS}) KDE3_ADD_EXECUTABLE(kile ${kile_SRCS}) -TARGET_LINK_LIBRARIES(kile ${QT_AND_KDECORE_LIBS} kjs tdeprint ktexteditor katepartinterfaces khtml ) +TARGET_LINK_LIBRARIES(kile ${QT_AND_TDECORE_LIBS} kjs tdeprint ktexteditor katepartinterfaces khtml ) INSTALL( TARGETS kile DESTINATION bin ) diff --git a/src/kile/Makefile.am b/src/kile/Makefile.am index 23a7023..d3b7182 100644 --- a/src/kile/Makefile.am +++ b/src/kile/Makefile.am @@ -81,7 +81,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # the library search path. -kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) rcdir = $(kde_datadir)/kile rc_DATA = kileui.rc docpartui.rc kilestdtools.rc tips diff --git a/src/kile/symbols/CMakeLists.txt b/src/kile/symbols/CMakeLists.txt index dfcf186..842bdcd 100644 --- a/src/kile/symbols/CMakeLists.txt +++ b/src/kile/symbols/CMakeLists.txt @@ -40,7 +40,7 @@ SET(gesymb_SRCS ) KDE3_AUTOMOC(${gesymb_SRCS}) ADD_EXECUTABLE(gesymb EXCLUDE_FROM_ALL ${gesymb_SRCS} ) -TARGET_LINK_LIBRARIES(gesymb ${QT_AND_KDECORE_LIBS} ) +TARGET_LINK_LIBRARIES(gesymb ${QT_AND_TDECORE_LIBS} ) ########### install files ############### |