Update autotools for new DSO linkage style

Fix FTBFS

Signed-off-by: François Andriot <francois.andriot@free.fr>

10 files changed, 10 insertions, 10 deletions

diff --git a/bab/Makefile.am b/bab/Makefile.am
index bf7a71e..7f65671 100644
--- a/bab/Makefile.am
+++ b/bab/Makefile.am
@@ -19,4 +19,4 @@ bin_PROGRAMS = bab
 # the application source, library search path, and link libraries
 bab_SOURCES = main.cpp styleconfdialog.cpp bab_iface.skel
 bab_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-bab_LDADD = $(LIB_KDEUI)
+bab_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
diff --git a/bab/main.cpp b/bab/main.cpp
index 14b23d1..df09293 100644
--- a/bab/main.cpp
+++ b/bab/main.cpp
@@ -330,7 +330,7 @@ void bab::saveSettings(){
    delete config;
 }
 
-QPoint *BabSwitcher::globalPos = new QPoint::QPoint(0,0);
+QPoint *BabSwitcher::globalPos = new QPoint(0,0);
 
 BabSwitcher::BabSwitcher(bab *parent, const char *name) 
                                           : KSystemTray(parent,name), DCOPObject("babInterface") {
diff --git a/config/Makefile.am b/config/Makefile.am
index 7cd149a..4c8bc59 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kstyle_baghira_config.la
 
 kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui
 # kstyle_baghira_config_la_METASOURCES = AUTO
-kstyle_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+kstyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
 kstyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN)
 
 
diff --git a/deco/Makefile.am b/deco/Makefile.am
index 6d435f2..7b55ace 100644
--- a/deco/Makefile.am
+++ b/deco/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = baghiraclient.h pixmaps.h masks.h
 kde_module_LTLIBRARIES = kwin3_baghira.la
 kwin3_baghira_la_SOURCES = baghiraclient.cc
 kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la
-kwin3_baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module
+kwin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module
 kwin3_baghira_la_METASOURCES = AUTO
 
 DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES)
diff --git a/deco/config/Makefile.am b/deco/config/Makefile.am
index b9b97ae..9352822 100644
--- a/deco/config/Makefile.am
+++ b/deco/config/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = baghiraconfig.h aquariusbutton.h colorpicker.h pixmaps.h
 kde_module_LTLIBRARIES = kwin_baghira_config.la
 kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
 kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_baghira_config_la_LIBADD = $(LIB_KDEUI)
+kwin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 kwin_baghira_config_la_METASOURCES = AUTO
 
 DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES)
diff --git a/kickermenu-3.3/Makefile.am b/kickermenu-3.3/Makefile.am
index 4d219df..ad5542d 100644
--- a/kickermenu-3.3/Makefile.am
+++ b/kickermenu-3.3/Makefile.am
@@ -14,7 +14,7 @@ lnk_DATA = b_menuapplet.desktop
 EXTRA_DIST = $(lnk_DATA)
 
 b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI)
+b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
 
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot
diff --git a/kickermenu/Makefile.am b/kickermenu/Makefile.am
index 5ab6cd5..db40fed 100644
--- a/kickermenu/Makefile.am
+++ b/kickermenu/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = menuapplet.h
 b_menu_panelapplet_la_METASOURCES = AUTO
 
 b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI)
+b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
 
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot
diff --git a/sessionapplet/dmctl.cpp b/sessionapplet/dmctl.cpp
index a6d5bf9..52ab3eb 100644
--- a/sessionapplet/dmctl.cpp
+++ b/sessionapplet/dmctl.cpp
@@ -37,7 +37,7 @@ static const char *ctl, *dpy;
 
 DM::DM() : fd( -1 )
 {
-	char *ptr;
+	const char *ptr;
 	struct sockaddr_un sa;
 
 	if (DMType == Dunno) {
diff --git a/sidebar/Makefile.am b/sidebar/Makefile.am
index 779e77d..aef9a69 100644
--- a/sidebar/Makefile.am
+++ b/sidebar/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = baghiralinkdrag.h baghirasidebar.h linkview.h listboxlink.h dnd
 
 konqsidebar_baghirasidebar_la_SOURCES = baghiralinkdrag.cpp baghirasidebar.cpp linkview.cpp listboxlink.cpp dndlistbox.cpp linkconfig.ui baghirasidebariface.skel
 konqsidebar_baghirasidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
-konqsidebar_baghirasidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE)
+konqsidebar_baghirasidebar_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KFILE)
 
 baghirasidebar_entry_DATA = baghirasidebar.desktop
 baghirasidebar_entrydir = $(kde_datadir)/konqsidebartng/entries
diff --git a/style/Makefile.am b/style/Makefile.am
index 2094915..cc324e4 100644
--- a/style/Makefile.am
+++ b/style/Makefile.am
@@ -5,7 +5,7 @@ noinst_HEADERS = baghira.h pixmaps.h bitmaps.h
 METASOURCES = AUTO
 kde_style_LTLIBRARIES = baghira.la
 baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-baghira_la_LIBADD = -lkdefx -lXtst $(LIB_KDEUI)
+baghira_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -lXtst
 baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp
 lnkdir = $(kde_datadir)/kstyle/themes
 lnk_DATA = baghira.themerc