# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1255202150 0
# Node ID 2469bf0e1e6355e1306c56d21899ae9c8aa741d8
# Parent  3a0c70761091fa0c8c811701e0d3b84dd554d682
* cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use .la
for Automake.

diff -r 3a0c70761091 -r 2469bf0e1e63 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 10 16:39:05 2009 +0000
+++ b/lisp/ChangeLog	Sat Oct 10 19:15:50 2009 +0000
@@ -1,3 +1,8 @@
+2009-10-10  Sascha Wilde <wilde@sha-bang.de>
+
+	* cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use
+	.la for Automake.
+
 2009-10-09  Chong Yidong  <cyd@stupidchicken.com>
 
 	* cedet/ede/pconf.el (ede-proj-configure-synchronize): Use
diff -r 3a0c70761091 -r 2469bf0e1e63 lisp/cedet/ede/proj-shared.el
--- a/lisp/cedet/ede/proj-shared.el	Sat Oct 10 16:39:05 2009 +0000
+++ b/lisp/cedet/ede/proj-shared.el	Sat Oct 10 19:15:50 2009 +0000
@@ -150,7 +150,11 @@
   "Return the name of the main target for THIS target."
   ;; We need some platform gunk to make the .so change to .sl, or .a,
   ;; depending on the platform we are going to compile against.
-  (concat "lib" (ede-name this) ".so"))
+  (concat "lib" (ede-name this)
+	  (if (eq (oref (ede-target-parent this) makefile-type)
+		  'Makefile.am)
+	      ".la"
+	    ".so")))
 
 (defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-shared-object))
   "Return the variable name for THIS's sources."