diff options
Diffstat (limited to 'lisp/cedet/ede/proj-shared.el')
| -rw-r--r-- | lisp/cedet/ede/proj-shared.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el index a31e1b3a172..a8edbe8fbdf 100644 --- a/lisp/cedet/ede/proj-shared.el +++ b/lisp/cedet/ede/proj-shared.el @@ -1,6 +1,6 @@ ;;; ede-proj-shared.el --- EDE Generic Project shared library support -;;; Copyright (C) 1998-2000, 2009-2013 Free Software Foundation, Inc. +;;; Copyright (C) 1998-2000, 2009-2015 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make @@ -166,19 +166,19 @@ Use ldlibs to add addition libraries.") "%.lo: %.c\n" "\t@echo '$(LTCOMPILE) -c $<'; \\\n" "\t$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<\n" - "\t@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \\\n" + "\t@-sed -e 's/^\\([^:]*\\)\\.o:/\\1.lo \\1.o:/' \\\n" "\t < .deps/$(*F).p > .deps/$(*F).P\n" "\t@-rm -f .deps/$(*F).p\n\n")) ) -(defmethod ede-proj-configure-add-missing +(cl-defmethod ede-proj-configure-add-missing ((this ede-proj-target-makefile-shared-object)) "Query if any files needed by THIS provided by automake are missing. Results in --add-missing being passed to automake." (not (and (ede-expand-filename (ede-toplevel) "ltconfig") (ede-expand-filename (ede-toplevel) "ltmain.sh")))) -(defmethod ede-proj-makefile-insert-automake-pre-variables +(cl-defmethod ede-proj-makefile-insert-automake-pre-variables ((this ede-proj-target-makefile-shared-object)) "Insert bin_PROGRAMS variables needed by target THIS. We aren't actually inserting SOURCE details, but this is used by the @@ -186,23 +186,23 @@ Makefile.am generator, so use it to add this important bin program." (ede-pmake-insert-variable-shared "lib_LTLIBRARIES" (insert (concat "lib" (ede-name this) ".la")))) -(defmethod ede-proj-makefile-insert-automake-post-variables +(cl-defmethod ede-proj-makefile-insert-automake-post-variables ((this ede-proj-target-makefile-shared-object)) "Insert bin_PROGRAMS variables needed by target THIS. We need to override -program which has an LDADD element." nil) -(defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-shared-object)) +(cl-defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-shared-object)) "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) ".la")) -(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-shared-object)) +(cl-defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-shared-object)) "Return the variable name for THIS's sources." (if (eq (oref (ede-target-parent this) makefile-type) 'Makefile.am) (concat "lib" (oref this name) "_la_SOURCES") - (call-next-method))) + (cl-call-next-method))) (provide 'ede/proj-shared) |