? p
Index: am.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/am.py,v
retrieving revision 1.57
diff -u -r1.57 am.py
--- am.py	22 Oct 2007 12:18:37 -0000	1.57
+++ am.py	26 Oct 2007 12:46:59 -0000
@@ -725,7 +725,7 @@
         fd.write(am_additional_install_libs(libname, sep, libmap["LIBS"], am))
 
     ldflags = []
-    if sep == '_' and pref == '':
+    if sep == '_':
         ldflags.append('-module')
     if libmap.has_key("LDFLAGS"):
         for x in libmap["LDFLAGS"]:
@@ -829,10 +829,15 @@
 
         if libsmap.has_key("LIBS"):
             _libs += libsmap["LIBS"];
-        if libsmap.has_key("LDFLAGS"):
-            _libs += libsmap["LDFLAGS"];
         if len(_libs) > 0:
             fd.write(am_additional_libs(libname, sep, "LIB", _libs, am))
+        ldflags = []
+        if sep == '_':
+            ldflags.append('-module')
+        if libsmap.has_key("LDFLAGS"):
+            ldflags += libsmap["LDFLAGS"];
+        if len(ldflags) > 0:
+            fd.write(am_additional_flags(libname, sep, "LIB", ldflags, am))
 ##        if sep == '_':
 ##            fd.write(am_additional_flags(libname, sep, "LIB", ['-module'], am))