[ekiga] Applied patch from Michael Rickmann for the win32 build

[Julien Puydt <jpuydt src gnome org>]

commit f850d827cd1066ad4729fb3f13fd785f01711d22
Author: Julien Puydt <jpuydt gnome org>
Date:   Fri Jul 10 21:49:39 2009 +0200

    Applied patch from Michael Rickmann for the win32 build

 configure.ac                     |    6 ++----
 lib/Makefile.am                  |    4 +---
 lib/engine/framework/Makefile.am |    1 +
 src/Makefile.am                  |    2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d4f94c3..25e4081 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,11 +101,9 @@ case $target_os in
     ;;
 
   mingw* )
-    LT_PROG_RC
-
     gm_platform="mingw"
-    CFLAGS="$CFLAGS -DSTATIC_LIBS_USED"
-    CXXFLAGS="$CXXFLAGS -DSTATIC_LIBS_USED"
+    CFLAGS="$CFLAGS -Wl,--enable-auto-import"
+    CXXFLAGS="$CXXFLAGS -Wl,--enable-auto-import"
     win32=1
     ;;
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9186589..cb9c155 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,10 +22,8 @@ INCLUDES =						\
 
 libekiga_la_LDFLAGS = -export-dynamic
 libekiga_la_LIBADD = \
-	gmconf/libgmconf.la \
 	gui/libgmwidgets.la \
-	toolbox/libtoolbox.la \
-	platform/libgmplatform.la
+	toolbox/libtoolbox.la
 
 if !WIN32
 libekiga_la_LIBADD += pixops/libpixops.la
diff --git a/lib/engine/framework/Makefile.am b/lib/engine/framework/Makefile.am
index f52e238..a7e3ae8 100644
--- a/lib/engine/framework/Makefile.am
+++ b/lib/engine/framework/Makefile.am
@@ -52,4 +52,5 @@ libgmframework_la_SOURCES = \
 libgmframework_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libgmframework_la_LIBADD = \
 	$(top_builddir)/lib/gmconf/libgmconf.la \
+	$(top_builddir)/lib/platform/libgmplatform.la \
 	$(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 00c8b6c..66fce4e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,7 +136,7 @@ service_in_files = $(service_DATA:.service=.service.in)
 endif
 
 .rc.o:
-	$(LIBTOOL) --tag=RC --mode=compile $(RC) $< -o $@ -I $(top_srcdir)
+	$(RC) $< -o $@ -I $(top_srcdir)
 
 GIT_REVISION=\"$$(cd ../.git; git describe )\"
 CACHED_REVISION=$$(cat revision.h 2>/dev/null | cut -c24-)