diff options
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | aclocal.m4 | 18 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | ksystemlog/doc/Makefile | 10 | ||||
| -rw-r--r-- | ksystemlog/doc/en/Makefile | 10 | ||||
| -rw-r--r-- | ksystemlog/po/Makefile | 10 | ||||
| -rw-r--r-- | ksystemlog/src/Makefile.am | 2 |
7 files changed, 34 insertions, 34 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7f7655e..2c43f1b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2010,30 +2010,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2022,30 +2022,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile index 1ebd654..2663f3f 100644 --- a/ksystemlog/doc/Makefile +++ b/ksystemlog/doc/Makefile @@ -127,11 +127,11 @@ LIB_TDEUI = -ltdeui LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml -LIB_KIO = -ltdeio -LIB_KPARTS = -ltdeparts -LIB_KSPELL = -ltdespell -LIB_KSYCOCA = -ltdeio -LIB_KUTILS = -ltdeutils +LIB_TDEIO = -ltdeio +LIB_TDEPARTS = -ltdeparts +LIB_TDESPELL = -ltdespell +LIB_TDESYCOCA = -ltdeio +LIB_TDEUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile index d54e89d..2ab3340 100644 --- a/ksystemlog/doc/en/Makefile +++ b/ksystemlog/doc/en/Makefile @@ -124,11 +124,11 @@ LIB_TDEUI = -ltdeui LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml -LIB_KIO = -ltdeio -LIB_KPARTS = -ltdeparts -LIB_KSPELL = -ltdespell -LIB_KSYCOCA = -ltdeio -LIB_KUTILS = -ltdeutils +LIB_TDEIO = -ltdeio +LIB_TDEPARTS = -ltdeparts +LIB_TDESPELL = -ltdespell +LIB_TDESYCOCA = -ltdeio +LIB_TDEUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile index e24a36c..079ce0b 100644 --- a/ksystemlog/po/Makefile +++ b/ksystemlog/po/Makefile @@ -124,11 +124,11 @@ LIB_TDEUI = -ltdeui LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml -LIB_KIO = -ltdeio -LIB_KPARTS = -ltdeparts -LIB_KSPELL = -ltdespell -LIB_KSYCOCA = -ltdeio -LIB_KUTILS = -ltdeutils +LIB_TDEIO = -ltdeio +LIB_TDEPARTS = -ltdeparts +LIB_TDESPELL = -ltdespell +LIB_TDESYCOCA = -ltdeio +LIB_TDEUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am index 775ee45..ca8b625 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeutils +ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeutils # the libraries to link against. ksystemlog_LDADD = \ |