From 797b05bed1ee954fb8e5e7a1cde047e044cd2fde Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@dside.dyndns.org>
Date: Sun, 11 Nov 2012 06:22:42 +0100
Subject: autoconf patches from ALT

---
 engines/Makefile.am  | 6 ++++--
 examples/Makefile.am | 4 ++--
 ui/Makefile.am       | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/engines/Makefile.am b/engines/Makefile.am
index 3b8c303..f9bf7eb 100644
--- a/engines/Makefile.am
+++ b/engines/Makefile.am
@@ -6,17 +6,19 @@ if HAVE_RCD
 lib_LTLIBRARIES += librcd_engine.la
 librcd_engine_la_SOURCES = librcd.c
 librcd_engine_la_LDFLAGS = -module -avoid-version -export-symbols-regex "rccGetInfo"
-librcd_engine_la_LIBADD = @RCD_LIBS@
+librcd_engine_la_LIBADD = ../src/librcc.la @RCD_LIBS@
 endif
 
 if HAVE_LIBGUESS
 lib_LTLIBRARIES += libguess_engine.la
 libguess_engine_la_SOURCES = libguess.c
 libguess_engine_la_LDFLAGS = -module -avoid-version -export-symbols-regex "rccGetInfo"
-libguess_engine_la_LIBADD = @LIBGUESS_LIBS@
+libguess_engine_la_LIBADD = ../src/librcc.la @LIBGUESS_LIBS@
 endif
 
 western_engine_la_SOURCES = western.c
 western_engine_la_LDFLAGS = -module -avoid-version -export-symbols-regex "rccGetInfo"
+western_engine_la_LIBADD = ../src/librcc.la
+
 
 AM_CPPFLAGS = -I../src @RCD_INCLUDES@ @LIBGUESS_INCLUDES@
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9d6331b..73ce228 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -7,14 +7,14 @@ example2_LDADD= ../src/librcc.la
 if HAVE_GTK
 bin_PROGRAMS+= rcc-gtk-config
 rcc_gtk_config_SOURCES = rcc-gtk-config.c
-rcc_gtk_config_LDADD=../ui/librccgtk.la @GTK1_LIBS@
+rcc_gtk_config_LDADD= ../src/librcc.la ../ui/librccgtk.la @GTK1_LIBS@
 rcc_gtk_config_CPPFLAGS = @GTK1_INCLUDES@ -I../src -I../ui
 endif
 
 if HAVE_GTK2
 bin_PROGRAMS+= rcc-gtk2-config
 rcc_gtk2_config_SOURCES = rcc-gtk-config.c
-rcc_gtk2_config_LDADD=../ui/librccgtk2.la @GTK2_LIBS@
+rcc_gtk2_config_LDADD= ../src/librcc.la ../ui/librccgtk2.la @GTK2_LIBS@
 rcc_gtk2_config_CPPFLAGS = @GTK2_CFLAGS@ -I../src -I../ui
 endif
 
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 3e8679e..82d3113 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -4,7 +4,7 @@ librccui_la_SOURCES = librccui.c \
     rccnames.c rccnames.h \
     internal.h \
     null.c    
-librccui_la_LIBADD = @XML_LIBS@ ../src/librcc.la
+librccui_la_LIBADD = ../src/librcc.la @XML_LIBS@
 librccui_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
 
 if HAVE_GTK
@@ -14,7 +14,7 @@ librccgtk_la_SOURCES = librccui.c \
     rccnames.c rccnames.h \
     internal.h \
     gtk.c    
-librccgtk_la_LIBADD = @GTK1_LIBS@ @XML_LIBS@ ../src/librcc.la
+librccgtk_la_LIBADD = ../src/librcc.la @GTK1_LIBS@ @XML_LIBS@
 librccgtk_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
 librccgtk_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK1_INCLUDES@
 endif
@@ -26,7 +26,7 @@ librccgtk2_la_SOURCES = librccui.c \
     rccnames.c rccnames.h \
     internal.h \
     gtk.c    
-librccgtk2_la_LIBADD = @GTK2_LIBS@ @XML_LIBS@ ../src/librcc.la
+librccgtk2_la_LIBADD = ../src/librcc.la @GTK2_LIBS@ @XML_LIBS@
 librccgtk2_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
 librccgtk2_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK2_CFLAGS@
 endif
@@ -38,7 +38,7 @@ librccgtk3_la_SOURCES = librccui.c \
     rccnames.c rccnames.h \
     internal.h \
     gtk.c    
-librccgtk3_la_LIBADD = @GTK3_LIBS@ @XML_LIBS@ ../src/librcc.la
+librccgtk3_la_LIBADD = ../src/librcc.la @GTK3_LIBS@ @XML_LIBS@
 librccgtk3_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
 librccgtk3_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK3_CFLAGS@
 endif
-- 
cgit v1.2.1