Rename a few build variables for overall consistency

pull/1/head
Timothy Pearson 12 years ago
parent 54f6d7a987
commit 92838ed89d

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

6
aclocal.m4 vendored

@ -2123,14 +2123,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_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
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")
@ -2140,7 +2140,7 @@ else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
fi
])

@ -7,6 +7,6 @@ ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \
multicachechecker.cpp
ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \
$(LIB_KFILE) $(LIB_KIO)
$(LIB_TDEFILE) $(LIB_KIO)
noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)

@ -14,7 +14,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/
ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against.
ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \
ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_TDEFILE) \
$(LIB_KIO) $(LIB_KPARTS) ../../apps/ktorrent/groups/libgroups.la \
../../libktorrent/libktorrent.la

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kttorinfo
kttorinfo_SOURCES = main.cpp
kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \
kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_TDEFILE) \
$(LIB_KIO)
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)

@ -12,7 +12,7 @@ ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \
# Libs needed by the plugin
ktinfowidgetplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
$(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
# LD flags for the plugin

@ -10,7 +10,7 @@ ktipfilterplugin_la_SOURCES = ipfilterplugin.cpp ipblockingpref.ui \
# Libs needed by the plugin
ktipfilterplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la $(LIB_QT) \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)

@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = ktlogviewerplugin.la
# Libs needed by the plugin
ktlogviewerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la $(LIB_QT) \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)

@ -8,7 +8,7 @@ ktpartfileimportplugin_la_SOURCES = partfileimportplugin.cpp importdlgbase.ui im
# Libs needed by the plugin
ktpartfileimportplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la \
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen

@ -25,7 +25,7 @@ ktscanfolderplugin_la_SOURCES = scanfolderplugin.cpp \
scanfolderpluginsettings.kcfgc scanfolderprefpage.cpp sfprefwidgetbase.ui scanfolderprefpagewidget.cpp \
scanfolder.cpp
ktscanfolderplugin_la_LIBADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)

@ -10,7 +10,7 @@ ktschedulerplugin_la_SOURCES = schedulerplugin.cpp \
# Libs needed by the plugin
ktschedulerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la \
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen

@ -9,7 +9,7 @@ ktsearchplugin_la_SOURCES = searchplugin.cpp htmlpart.cpp searchbar.ui \
# Libs needed by the plugin
ktsearchplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
$(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen

@ -16,7 +16,7 @@ ktupnpplugin_la_SOURCES = upnpplugin.cpp upnpprefpage.cpp upnpwidget.ui \
ktupnpplugin_la_LIBADD = libktupnp.la \
$(LIB_KPARTS) ../../libktorrent/libktorrent.la \
$(LIB_QT) \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)

@ -12,7 +12,7 @@ ktwebinterfaceplugin_la_SOURCES = webinterfaceplugin.cpp httpserver.cpp \
# Libs needed by the plugin
ktwebinterfaceplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
$(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen

@ -11,7 +11,7 @@ ktzeroconfplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(AVAHI_LIB
ktzeroconfplugin_la_SOURCES = localbrowser.cpp avahiservice.cpp \
zeroconfplugin.cpp
ktzeroconfplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI)\
ktzeroconfplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_TDEUI)\
$(LIB_QT) ../../libktorrent/libktorrent.la
noinst_HEADERS = zeroconfplugin.h

Loading…
Cancel
Save