From 3f8a4b4535f69f54cf20cc4ee35156473e16cec9 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Mon, 20 Nov 2006 00:56:24 -0600
Subject: [PATCH] Pass resourse file to linker

---
 moo.kdevelop    |  8 ++++----
 moo/Makefile.am | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/moo.kdevelop b/moo.kdevelop
index 44747404..87680d08 100644
--- a/moo.kdevelop
+++ b/moo.kdevelop
@@ -293,16 +293,16 @@
   </kdevdoctreeview>
   <kdevfilecreate>
     <filetypes>
-      <type icon="source" ext="g" name="GAP source" create="template" >
+      <type icon="source" ext="g" create="template" name="GAP source" >
         <descr>A new empty GAP source file</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
         <descr>A new empty C++ file.</descr>
       </type>
-      <type icon="source_h" ext="h" name="C/C++ Header" create="template" >
+      <type icon="source_h" ext="h" create="template" name="C/C++ Header" >
         <descr>A new empty header file for C/C++.</descr>
       </type>
-      <type icon="source_c" ext="c" name="C Source" create="template" >
+      <type icon="source_c" ext="c" create="template" name="C Source" >
         <descr>A new empty C file.</descr>
       </type>
     </filetypes>
diff --git a/moo/Makefile.am b/moo/Makefile.am
index fa28e2f3..8ecdb2a2 100644
--- a/moo/Makefile.am
+++ b/moo/Makefile.am
@@ -53,18 +53,19 @@ else
 noinst_LTLIBRARIES += libmoo.la
 endif
 
-libmoo_la_LIBADD = $(libs) $(MOO_LIBS)
-# libmoo_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) -no-undefined -avoid-version -export-symbols-regex "^(moo_|ms_).*"
-libmoo_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) -no-undefined -avoid-version -export-symbols-regex ".*"
-libmoo_la_SOURCES = $(moo_include_headers)
-
 if MOO_OS_MINGW
-libmoo_la_LIBADD += libmoo.res
 CLEANFILES = libmoo.res
+libmoo_res_ldflag = -Wl,libmoo.res
+libmoo_la_DEPENDENCIES = libmoo.res
 libmoo.res: libmoo.rc
 	$(WINDRES) -i libmoo.rc --input-format=rc -o libmoo.res -O coff
 endif
 
+libmoo_la_LIBADD = $(libs) $(MOO_LIBS)
+# libmoo_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) $(libmoo_res_ldflag) -no-undefined -avoid-version -export-symbols-regex "^(moo_|ms_).*"
+libmoo_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) $(libmoo_res_ldflag) -no-undefined -avoid-version -export-symbols-regex ".*"
+libmoo_la_SOURCES = $(moo_include_headers)
+
 moo_la_ldflags = -no-undefined -module -avoid-version -export-symbols-regex initmoo
 pymoo_la_ldflags = -no-undefined -module -avoid-version -export-symbols-regex moo_module_init