diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:25:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:25:55 -0600 |
| commit | 964c6827b1fc44f9adf9b3b91a3d91c83c48a65c (patch) | |
| tree | 59dc586fc7757055d8e97e922bc04a586646d1aa | |
| parent | 3ada5b11ddae4d6e17e394b10a7efa5b940f75c9 (diff) | |
| download | soundkonverter-964c6827b1fc44f9adf9b3b91a3d91c83c48a65c.tar.gz soundkonverter-964c6827b1fc44f9adf9b3b91a3d91c83c48a65c.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/metadata/wavpack/taglib_wavpackfiletyperesolver.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 885eba2..b07ad19 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2087,14 +2087,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-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_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else 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, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/src/Makefile.am b/src/Makefile.am index 1ff2880..3f3be62 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,7 +37,7 @@ soundkonverter_SOURCES = cddb.cpp cdmanager.cpp cdopener.cpp combobutton.cpp \ progressindicator.cpp replaygain.cpp replaygainfilelist.cpp replaygainscanner.cpp \ soundkonverter.cpp soundkonverterapp.cpp 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 xdg_apps_DATA = soundkonverter.desktop diff --git a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h b/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h index b9d4500..cc107a8 100644 --- a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h +++ b/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h @@ -19,8 +19,8 @@ * MA 02110-1301 USA * ***************************************************************************/ -#ifndef TAGLIB_WAVPACKFILETYPERESOLVER_H -#define TAGLIB_WAVPACKFILETYPERESOLVER_H +#ifndef TAGLIB_WAVPACTDEFILETYPERESOLVER_H +#define TAGLIB_WAVPACTDEFILETYPERESOLVER_H #include <taglib/tfile.h> #include <taglib/fileref.h> |