TDE
/
soundkonverter
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a few build variables for overall consistency

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 3ada5b11dd
commit 964c6827b1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
acinclude.m4
Unescape View File

@ -2087,14 +2087,14 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

2
src/Makefile.am
Unescape View File

@ -37,7 +37,7 @@ soundkonverter_SOURCES = cddb.cpp cdmanager.cpp cdopener.cpp combobutton.cpp \
progressindicator.cpp replaygain.cpp replaygainfilelist.cpp replaygainscanner.cpp \ progressindicator.cpp replaygain.cpp replaygainfilelist.cpp replaygainscanner.cpp \
soundkonverter.cpp soundkonverterapp.cpp soundkonverter.cpp soundkonverterapp.cpp
soundkonverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor soundkonverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
soundkonverter_LDADD = $(LIB_TDEUI) $(LIB_KFILE) metadata/libmetadata.la \ soundkonverter_LDADD = $(LIB_TDEUI) $(LIB_TDEFILE) metadata/libmetadata.la \
pluginloader/libpluginloader.la -lcdda_interface -lcdda_paranoia pluginloader/libpluginloader.la -lcdda_interface -lcdda_paranoia
xdg_apps_DATA = soundkonverter.desktop xdg_apps_DATA = soundkonverter.desktop

4
src/metadata/wavpack/taglib_wavpackfiletyperesolver.h
Unescape View File

@ -19,8 +19,8 @@
* MA 02110-1301 USA * * MA 02110-1301 USA *
***************************************************************************/ ***************************************************************************/
#ifndef TAGLIB_WAVPACKFILETYPERESOLVER_H #ifndef TAGLIB_WAVPACTDEFILETYPERESOLVER_H
#define TAGLIB_WAVPACKFILETYPERESOLVER_H #define TAGLIB_WAVPACTDEFILETYPERESOLVER_H
#include <taglib/tfile.h> #include <taglib/tfile.h>
#include <taglib/fileref.h> #include <taglib/fileref.h>

Write Preview
Loading…
Cancel
Save