[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj-shared.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/10 19:15:54

Modified files:
        lisp           : ChangeLog 
        lisp/cedet/ede : proj-shared.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16397&r2=1.16398
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/proj-shared.el?cvsroot=emacs&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16397
retrieving revision 1.16398
diff -u -b -r1.16397 -r1.16398
--- ChangeLog   9 Oct 2009 20:32:02 -0000       1.16397
+++ ChangeLog   10 Oct 2009 19:15:50 -0000      1.16398
@@ -1,3 +1,8 @@
+2009-10-10  Sascha Wilde <address@hidden>
+
+       * cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use
+       .la for Automake.
+
 2009-10-09  Chong Yidong  <address@hidden>
 
        * cedet/ede/pconf.el (ede-proj-configure-synchronize): Use

Index: cedet/ede/proj-shared.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/proj-shared.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cedet/ede/proj-shared.el    2 Oct 2009 10:53:34 -0000       1.3
+++ cedet/ede/proj-shared.el    10 Oct 2009 19:15:54 -0000      1.4
@@ -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."