diff options
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| -rw-r--r-- | aclocal.m4 | 24 | ||||
| -rw-r--r-- | ksystemlog/doc/Makefile | 8 | ||||
| -rw-r--r-- | ksystemlog/doc/en/Makefile | 8 | ||||
| -rw-r--r-- | ksystemlog/po/Makefile | 8 | ||||
| -rw-r--r-- | ksystemlog/src/Makefile.am | 4 |
6 files changed, 38 insertions, 38 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 002d75a..9bc2310 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2008,8 +2008,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], AC_REQUIRE([K_PATH_X]) if test $kde_qtver = 3; 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_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") @@ -2017,15 +2017,15 @@ 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") # these are for backward compatibility 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") @@ -2034,13 +2034,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 ]) @@ -2020,8 +2020,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], AC_REQUIRE([K_PATH_X]) if test $kde_qtver = 3; 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_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") @@ -2029,15 +2029,15 @@ 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") # these are for backward compatibility 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") @@ -2046,13 +2046,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/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile index dd9b746..d708628 100644 --- a/ksystemlog/doc/Makefile +++ b/ksystemlog/doc/Makefile @@ -120,10 +120,10 @@ LIBUTIL = -lutil LIBZ = -lz LIB_KAB = -lkab LIB_KABC = -lkabc -LIB_KDECORE = -ltdecore -LIB_KDEPIM = -ltdepim -LIB_KDEPRINT = -ltdeprint -LIB_KDEUI = -ltdeui +LIB_TDECORE = -ltdecore +LIB_TDEPIM = -ltdepim +LIB_TDEPRINT = -ltdeprint +LIB_TDEUI = -ltdeui LIB_KFILE = -lkio LIB_KFM = LIB_KHTML = -lkhtml diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile index 6eb18f2..7472674 100644 --- a/ksystemlog/doc/en/Makefile +++ b/ksystemlog/doc/en/Makefile @@ -117,10 +117,10 @@ LIBUTIL = -lutil LIBZ = -lz LIB_KAB = -lkab LIB_KABC = -lkabc -LIB_KDECORE = -ltdecore -LIB_KDEPIM = -ltdepim -LIB_KDEPRINT = -ltdeprint -LIB_KDEUI = -ltdeui +LIB_TDECORE = -ltdecore +LIB_TDEPIM = -ltdepim +LIB_TDEPRINT = -ltdeprint +LIB_TDEUI = -ltdeui LIB_KFILE = -lkio LIB_KFM = LIB_KHTML = -lkhtml diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile index 3909970..08d1077 100644 --- a/ksystemlog/po/Makefile +++ b/ksystemlog/po/Makefile @@ -117,10 +117,10 @@ LIBUTIL = -lutil LIBZ = -lz LIB_KAB = -lkab LIB_KABC = -lkabc -LIB_KDECORE = -ltdecore -LIB_KDEPIM = -ltdepim -LIB_KDEPRINT = -ltdeprint -LIB_KDEUI = -ltdeui +LIB_TDECORE = -ltdecore +LIB_TDEPIM = -ltdepim +LIB_TDEPRINT = -ltdeprint +LIB_TDEUI = -ltdeui LIB_KFILE = -lkio LIB_KFM = LIB_KHTML = -lkhtml diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am index 6b21160..e09b0c3 100644 --- a/ksystemlog/src/Makefile.am +++ b/ksystemlog/src/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = -I$(top_srcdir)/ksystemlog/src -I$(top_builddir)/ksystemlog/src/ -I$(top_srcdir)/ksystemlog/src/system -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes) # the library search path. -ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkutils +ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkutils # the libraries to link against. ksystemlog_LDADD = \ @@ -30,7 +30,7 @@ ksystemlog_LDADD = \ $(top_builddir)/ksystemlog/src/cron/libksystemlog_cron.la \ $(top_builddir)/ksystemlog/src/apache/libksystemlog_apache.la \ $(top_builddir)/ksystemlog/src/samba/libksystemlog_samba.la \ - $(LIB_KFILE) $(LIB_KDEPRINT) + $(LIB_KFILE) $(LIB_TDEPRINT) # which sources should be compiled for ksystemlog |