diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-04 13:49:49 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-04 13:49:49 -0500 |
commit | 73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121 (patch) | |
tree | fc2ee663521960bf1c102bb98a72f31903e5110b /lisp/cedet/ede/proj-shared.el | |
parent | 102a21d68976ab9dc85304e0bc47b7562d3cf93f (diff) | |
download | emacs-73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121.tar.gz |
* lisp/cedet: Use cl-generic instead of EIEIO's defgeneric/defmethod
* lisp/cedet/**/*.el: Mechanically replace all calls to defmethod/defgeneric
by calls to cl-defmethod/cl-defgeneric.
* lisp/cedet/srecode/table.el:
* lisp/cedet/srecode/fields.el:
* lisp/cedet/srecode/dictionary.el:
* lisp/cedet/srecode/compile.el:
* lisp/cedet/semantic/debug.el:
* lisp/cedet/semantic/db-ref.el:
* lisp/cedet/ede/base.el:
* lisp/cedet/ede/auto.el:
* lisp/cedet/ede.el: Require `cl-generic'.
Diffstat (limited to 'lisp/cedet/ede/proj-shared.el')
-rw-r--r-- | lisp/cedet/ede/proj-shared.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el index 37999a37593..dfd44ac07c6 100644 --- a/lisp/cedet/ede/proj-shared.el +++ b/lisp/cedet/ede/proj-shared.el @@ -171,14 +171,14 @@ Use ldlibs to add addition libraries.") "\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) |