Rename a few build variables for overall consistency

pull/1/head
Timothy Pearson 12 years ago
parent 3385ca9566
commit ef50babf63

@ -2111,14 +2111,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")
@ -2128,7 +2128,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
])

@ -158,7 +158,7 @@ libamarok_la_LIBADD = \
$(top_builddir)/amarok/src/statusbar/libstatusbar.la \
$(top_builddir)/amarok/src/metadata/libmetadata.la \
$(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
$(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \
$(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \
$(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
$(LIB_TUNEPIMP) \
$(mysql_libs) \

@ -10,7 +10,7 @@ INCLUDES = \
libamarok_kdemmengine_plugin_la_LIBADD = \
$(top_builddir)/amarok/src/libamarok.la \
$(top_builddir)/amarok/src/plugin/libplugin.la \
$(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
$(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
$(LIBS_KDEMM) -lkdemm
libamarok_kdemmengine_plugin_la_SOURCES = \

@ -10,7 +10,7 @@ INCLUDES = \
libamarok_masengine_plugin_la_LIBADD = \
$(top_builddir)/amarok/src/engine/libengine.la \
$(top_builddir)/amarok/src/plugin/libplugin.la \
$(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
$(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
$(LIBS_MAS)
libamarok_masengine_plugin_la_SOURCES = \

@ -15,7 +15,7 @@ INCLUDES = \
libamarok_nmmengine_plugin_la_LIBADD = \
$(top_builddir)/amarok/src/libamarok.la \
$(top_builddir)/amarok/src/plugin/libplugin.la \
$(LIB_TDECORE) $(LIB_KFILE) \
$(LIB_TDECORE) $(LIB_TDEFILE) \
-lnmmbase -lnmmgraphmgr -lnmmiprogress -lnmmiaudiodevice -lnmmigeneral
libamarok_nmmengine_plugin_la_SOURCES = \

@ -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>

@ -17211,10 +17211,10 @@ static int winFileSize(OsFile *id, i64 *pSize){
}
/*
** LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems.
** LOCTDEFILE_FAIL_IMMEDIATELY is undefined on some Windows systems.
*/
#ifndef LOCKFILE_FAIL_IMMEDIATELY
# define LOCKFILE_FAIL_IMMEDIATELY 1
#ifndef LOCTDEFILE_FAIL_IMMEDIATELY
# define LOCTDEFILE_FAIL_IMMEDIATELY 1
#endif
/*
@ -17229,7 +17229,7 @@ static int getReadLock(winFile *id){
ovlp.Offset = SHARED_FIRST;
ovlp.OffsetHigh = 0;
ovlp.hEvent = 0;
res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp);
res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp);
}else{
int lk;
sqlite3Randomness(sizeof(lk), &lk);

Loading…
Cancel
Save