* cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use .la

for Automake.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a28a788ac88cd8126bfa62b82ad7ece890b85a65..adfbf9cad164be9b9dae80d4bbe40eec80cc5d6c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index f9379d5c1c3880e1fcd1b364f5e471e348611186..37aeb7230422c32f96a91a99e67814c377f7c64d 100644 (file)
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -150,7 +150,11 @@ We need to override -program which has an LDADD element."
   "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."