Mercurial > emacs
changeset 105538:2469bf0e1e63
* cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use .la
for Automake.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 10 Oct 2009 19:15:50 +0000 |
| parents | 3a0c70761091 |
| children | 4886a9e0be01 |
| files | lisp/ChangeLog lisp/cedet/ede/proj-shared.el |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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."