summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-29 23:25:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-29 23:25:55 -0600
commit964c6827b1fc44f9adf9b3b91a3d91c83c48a65c (patch)
tree59dc586fc7757055d8e97e922bc04a586646d1aa /src
parent3ada5b11ddae4d6e17e394b10a7efa5b940f75c9 (diff)
downloadsoundkonverter-964c6827b1fc44f9adf9b3b91a3d91c83c48a65c.tar.gz
soundkonverter-964c6827b1fc44f9adf9b3b91a3d91c83c48a65c.zip
Rename a few build variables for overall consistency
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/metadata/wavpack/taglib_wavpackfiletyperesolver.h4
2 files changed, 3 insertions, 3 deletions
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>