diff options
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| -rw-r--r-- | plugin/Makefile.am | 4 | ||||
| -rw-r--r-- | smb4k/Makefile.am | 4 | ||||
| -rw-r--r-- | smb4k/browser/Makefile.am | 4 | ||||
| -rw-r--r-- | smb4k/configdlg/Makefile.am | 4 | ||||
| -rw-r--r-- | smb4k/core/Makefile.am | 2 | ||||
| -rw-r--r-- | smb4k/dialogs/Makefile.am | 2 | ||||
| -rw-r--r-- | smb4k/iconview/Makefile.am | 2 | ||||
| -rw-r--r-- | smb4k/listview/Makefile.am | 2 | ||||
| -rw-r--r-- | smb4k/searchdlg/Makefile.am | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 29715e3..d95377d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2068,8 +2068,8 @@ if test $kde_qtver = 3; then *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") @@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") @@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_SMB, "-lsmb") @@ -2099,13 +2099,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + 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, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/plugin/Makefile.am b/plugin/Makefile.am index db77a81..0e595c1 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -5,8 +5,8 @@ konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \ -L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(KDE_PLUGIN) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) \ - $(LIB_KDEUI) + $(KDE_PLUGIN) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) \ + $(LIB_TDEUI) globaladddir = $(kde_datadir)/konqsidebartng/add globaladd_DATA = smb4k_add.desktop diff --git a/smb4k/Makefile.am b/smb4k/Makefile.am index 39c9129..87fb71d 100644 --- a/smb4k/Makefile.am +++ b/smb4k/Makefile.am @@ -8,8 +8,8 @@ bin_PROGRAMS = smb4k smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) -smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor + $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) +smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor KDE_ICON = smb4k diff --git a/smb4k/browser/Makefile.am b/smb4k/browser/Makefile.am index 1e0d279..a10c4f7 100644 --- a/smb4k/browser/Makefile.am +++ b/smb4k/browser/Makefile.am @@ -7,8 +7,8 @@ libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \ smb4knetworkbrowser.cpp smb4knetworkbrowseritem.cpp \ smb4knetworkbrowsertooltip.cpp libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KDECORE) \ - $(LIB_KDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT) + $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \ + $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT) libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries) partrcdir = $(kde_datadir)/smb4knetworkbrowserpart diff --git a/smb4k/configdlg/Makefile.am b/smb4k/configdlg/Makefile.am index 840dd6d..6e13d4d 100644 --- a/smb4k/configdlg/Makefile.am +++ b/smb4k/configdlg/Makefile.am @@ -8,5 +8,5 @@ libsmb4kconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4kconfigdialog.cpp \ smb4knetworkoptions.cpp smb4krsyncoptions.cpp smb4ksambaoptions.cpp smb4kshareoptions.cpp \ smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp libsmb4kconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) -libsmb4kconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KDECORE) $(LIB_KFILE) + $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) +libsmb4kconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_KFILE) diff --git a/smb4k/core/Makefile.am b/smb4k/core/Makefile.am index 955df6d..0cddd37 100644 --- a/smb4k/core/Makefile.am +++ b/smb4k/core/Makefile.am @@ -18,7 +18,7 @@ libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \ smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \ smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \ smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp -libsmb4kcore_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) +libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) kde_kcfg_DATA = smb4k.kcfg diff --git a/smb4k/dialogs/Makefile.am b/smb4k/dialogs/Makefile.am index 28a1b47..7846fed 100644 --- a/smb4k/dialogs/Makefile.am +++ b/smb4k/dialogs/Makefile.am @@ -6,6 +6,6 @@ libsmb4kdialogs_la_SOURCES = smb4kbookmarkeditor.cpp \ smb4kcustomoptionsdialog.cpp smb4kmountdialog.cpp smb4kpreviewdialog.cpp smb4kprintdialog.cpp \ smb4ksynchronizationdialog.cpp libsmb4kdialogs_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) + $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) noinst_HEADERS = smb4kbookmarkeditor.h smb4kmountdialog.h smb4kpreviewdialog.h \ smb4kprintdialog.h smb4ksynchronizationdialog.h diff --git a/smb4k/iconview/Makefile.am b/smb4k/iconview/Makefile.am index ec51fb2..6c03d0c 100644 --- a/smb4k/iconview/Makefile.am +++ b/smb4k/iconview/Makefile.am @@ -9,7 +9,7 @@ libsmb4ksharesiconview_la_LDFLAGS = -module -no-undefined $(all_libraries) noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \ smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \ + $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \ $(LIB_QT) partrcdir = $(kde_datadir)/smb4ksharesiconviewpart diff --git a/smb4k/listview/Makefile.am b/smb4k/listview/Makefile.am index 87aec20..8fb182b 100644 --- a/smb4k/listview/Makefile.am +++ b/smb4k/listview/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libsmb4kshareslistview.la libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \ + $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \ $(LIB_QT) libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries) diff --git a/smb4k/searchdlg/Makefile.am b/smb4k/searchdlg/Makefile.am index 3045fab..bef68fc 100644 --- a/smb4k/searchdlg/Makefile.am +++ b/smb4k/searchdlg/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = libsmb4ksearchdialog.la libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(LIB_KDECORE) $(LIB_KDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT) + $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT) noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \ smb4ksearchdialogitem.h libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \ |