From d751f122b6384c3f853fde7fe274a83f113ee3ae Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 10 Oct 2009 19:15:50 +0000 Subject: [PATCH] * cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use .la for Automake. --- lisp/ChangeLog | 5 +++++ lisp/cedet/ede/proj-shared.el | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a28a788ac88..adfbf9cad16 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-10-10 Sascha Wilde + + * cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use + .la for Automake. + 2009-10-09 Chong Yidong * 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 f9379d5c1c3..37aeb723042 100644 --- 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." -- 2.11.4.GIT