TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
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 3385ca9566
commit ef50babf63
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

6
acinclude.m4
Unescape View File

@ -2111,14 +2111,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")
@ -2128,7 +2128,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
amarok/src/Makefile.am
Unescape View File

@ -158,7 +158,7 @@ libamarok_la_LIBADD = \
$(top_builddir)/amarok/src/statusbar/libstatusbar.la \ $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
$(top_builddir)/amarok/src/metadata/libmetadata.la \ $(top_builddir)/amarok/src/metadata/libmetadata.la \
$(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.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) \ $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
$(LIB_TUNEPIMP) \ $(LIB_TUNEPIMP) \
$(mysql_libs) \ $(mysql_libs) \

2
amarok/src/engine/kdemm/Makefile.am
Unescape View File

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

2
amarok/src/engine/mas/Makefile.am
Unescape View File

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

2
amarok/src/engine/nmm/Makefile.am
Unescape View File

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

4
amarok/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>

8
amarok/src/sqlite/sqlite3.c
Unescape View File

@ -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 #ifndef LOCTDEFILE_FAIL_IMMEDIATELY
# define LOCKFILE_FAIL_IMMEDIATELY 1 # define LOCTDEFILE_FAIL_IMMEDIATELY 1
#endif #endif
/* /*
@ -17229,7 +17229,7 @@ static int getReadLock(winFile *id){
ovlp.Offset = SHARED_FIRST; ovlp.Offset = SHARED_FIRST;
ovlp.OffsetHigh = 0; ovlp.OffsetHigh = 0;
ovlp.hEvent = 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{ }else{
int lk; int lk;
sqlite3Randomness(sizeof(lk), &lk); sqlite3Randomness(sizeof(lk), &lk);

Write Preview
Loading…
Cancel
Save