summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acinclude.m424
-rw-r--r--k3bsetup/Makefile.am2
-rw-r--r--kfile-plugins/k3bproject/Makefile.am2
-rw-r--r--plugins/decoder/ffmpeg/Makefile.am2
-rw-r--r--plugins/decoder/flac/Makefile.am2
-rw-r--r--plugins/decoder/libsndfile/Makefile.am2
-rw-r--r--plugins/decoder/mp3/Makefile.am2
-rw-r--r--plugins/decoder/wave/Makefile.am2
-rw-r--r--plugins/encoder/external/Makefile.am2
-rw-r--r--plugins/encoder/lame/Makefile.am2
-rw-r--r--plugins/encoder/ogg/Makefile.am2
-rw-r--r--plugins/encoder/sox/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/fastscale/Makefile.am2
14 files changed, 25 insertions, 25 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 5861e34..c3d3129 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2092,8 +2092,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")
@@ -2102,9 +2102,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")
@@ -2113,8 +2113,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")
@@ -2123,13 +2123,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/k3bsetup/Makefile.am b/k3bsetup/Makefile.am
index 42d3bee..4ea602c 100644
--- a/k3bsetup/Makefile.am
+++ b/k3bsetup/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_k3bsetup2.la
kcm_k3bsetup2_la_SOURCES = base_k3bsetup2.ui k3bsetup2.cpp
-kcm_k3bsetup2_la_LIBADD = $(LIB_KDEUI) ../libk3b/libk3b.la
+kcm_k3bsetup2_la_LIBADD = $(LIB_TDEUI) ../libk3b/libk3b.la
kcm_k3bsetup2_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
k3bsetup2_DATA = k3bsetup2.desktop
diff --git a/kfile-plugins/k3bproject/Makefile.am b/kfile-plugins/k3bproject/Makefile.am
index 2586e19..d3f53d4 100644
--- a/kfile-plugins/k3bproject/Makefile.am
+++ b/kfile-plugins/k3bproject/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS = kfile_k3bprojectfileplugin.h
kde_module_LTLIBRARIES = kfile_k3b.la
kfile_k3b_la_SOURCES = kfile_k3bprojectfileplugin.cpp
-kfile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
+kfile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
kfile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la
# let automoc handle all of the meta source files (moc)
diff --git a/plugins/decoder/ffmpeg/Makefile.am b/plugins/decoder/ffmpeg/Makefile.am
index b4c46e2..2e00dc5 100644
--- a/plugins/decoder/ffmpeg/Makefile.am
+++ b/plugins/decoder/ffmpeg/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = libk3bffmpegdecoder.la
libk3bffmpegdecoder_la_SOURCES = k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp
-libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lavcodec -lavformat
+libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDEUI) -lavcodec -lavformat
libk3bffmpegdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/flac/Makefile.am b/plugins/decoder/flac/Makefile.am
index bdcc4a3..dd9b3b8 100644
--- a/plugins/decoder/flac/Makefile.am
+++ b/plugins/decoder/flac/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bflacdecoder.la
libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp
-libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lFLAC++ -lFLAC $(taglib_libs)
+libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDEUI) -lFLAC++ -lFLAC $(taglib_libs)
libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/libsndfile/Makefile.am b/plugins/decoder/libsndfile/Makefile.am
index 2af9911..fec858f 100644
--- a/plugins/decoder/libsndfile/Makefile.am
+++ b/plugins/decoder/libsndfile/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3blibsndfiledecoder.la
libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
-libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lsndfile
+libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDEUI) -lsndfile
libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/mp3/Makefile.am b/plugins/decoder/mp3/Makefile.am
index 7f74d21..a2befe9 100644
--- a/plugins/decoder/mp3/Makefile.am
+++ b/plugins/decoder/mp3/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bmaddecoder.la
libk3bmaddecoder_la_SOURCES = k3bmad.cpp k3bmaddecoder.cpp
-libk3bmaddecoder_la_LIBADD = $(LIB_KDECORE) $(MAD_LIB) $(taglib_libs) ../../../libk3b/libk3b.la
+libk3bmaddecoder_la_LIBADD = $(LIB_TDECORE) $(MAD_LIB) $(taglib_libs) ../../../libk3b/libk3b.la
libk3bmaddecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/wave/Makefile.am b/plugins/decoder/wave/Makefile.am
index 5debea1..d35927c 100644
--- a/plugins/decoder/wave/Makefile.am
+++ b/plugins/decoder/wave/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bwavedecoder.la
libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp
-libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) ../../../libk3b/libk3b.la
+libk3bwavedecoder_la_LIBADD = $(LIB_TDECORE) ../../../libk3b/libk3b.la
libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/encoder/external/Makefile.am b/plugins/encoder/external/Makefile.am
index a095688..c463c21 100644
--- a/plugins/encoder/external/Makefile.am
+++ b/plugins/encoder/external/Makefile.am
@@ -6,7 +6,7 @@ libk3bexternalencoder_la_SOURCES = base_k3bexternalencoderconfigwidget.ui \
base_k3bexternalencodereditwidget.ui k3bexternalencoder.cpp \
k3bexternalencoderconfigwidget.cpp k3bexternalencodercommand.cpp
-libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
+libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE)
libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/encoder/lame/Makefile.am b/plugins/encoder/lame/Makefile.am
index 4a4d61e..15e310e 100644
--- a/plugins/encoder/lame/Makefile.am
+++ b/plugins/encoder/lame/Makefile.am
@@ -6,7 +6,7 @@ libk3blameencoder_la_SOURCES = base_k3blameencodersettingswidget.ui \
base_k3bmanualbitratesettingswidget.ui \
k3blameencoder.cpp
-libk3blameencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -lmp3lame
+libk3blameencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE) -lmp3lame
libk3blameencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/encoder/ogg/Makefile.am b/plugins/encoder/ogg/Makefile.am
index 712adbb..0b18edc 100644
--- a/plugins/encoder/ogg/Makefile.am
+++ b/plugins/encoder/ogg/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3boggvorbisencoder.la
libk3boggvorbisencoder_la_SOURCES = base_k3boggvorbisencodersettingswidget.ui k3boggvorbisencoder.cpp
-libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc
+libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE) -logg -lvorbis -lvorbisenc
libk3boggvorbisencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/encoder/sox/Makefile.am b/plugins/encoder/sox/Makefile.am
index 535b1c0..383b750 100644
--- a/plugins/encoder/sox/Makefile.am
+++ b/plugins/encoder/sox/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bsoxencoder.la
libk3bsoxencoder_la_SOURCES = base_k3bsoxencoderconfigwidget.ui k3bsoxencoder.cpp
-libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
+libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE)
libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/src/Makefile.am b/src/Makefile.am
index 7677258..3eb6d1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,7 +74,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libk3b/tools \
METASOURCES = AUTO
# the library search path.
-k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
rcdir = $(kde_datadir)/k3b
rc_DATA = k3bui.rc eventsrc tips
diff --git a/src/fastscale/Makefile.am b/src/fastscale/Makefile.am
index 2fafe00..d812dc3 100644
--- a/src/fastscale/Makefile.am
+++ b/src/fastscale/Makefile.am
@@ -9,6 +9,6 @@ libfastscale_la_SOURCES = \
scale.cpp \
asm_scale.S
-libfastscale_la_LIBADD = $(LIB_KDECORE) $(LIBQT) $(LIBJPEG)
+libfastscale_la_LIBADD = $(LIB_TDECORE) $(LIBQT) $(LIBJPEG)
METASOURCES = AUTO
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-15 22:15:07 +0000