Mercurial > emacs
changeset 105439:9248683abf3b
* cedet/ede/proj-comp.el: Don't require ede/pmake at toplevel.
(ede-proj-makefile-insert-variables): Require ede/pmake.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 04 Oct 2009 14:25:42 +0000 |
| parents | 236504656438 |
| children | bec7f10791da |
| files | lisp/ChangeLog lisp/cedet/ede/proj-comp.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 04 12:20:13 2009 +0000 +++ b/lisp/ChangeLog Sun Oct 04 14:25:42 2009 +0000 @@ -1,3 +1,8 @@ +2009-10-04 Chong Yidong <cyd@stupidchicken.com> + + * cedet/ede/proj-comp.el: Don't require ede/pmake at toplevel. + (ede-proj-makefile-insert-variables): Require ede/pmake. + 2009-10-04 Michael Albinus <michael.albinus@gmx.de> * files.el (copy-directory): New defun.
--- a/lisp/cedet/ede/proj-comp.el Sun Oct 04 12:20:13 2009 +0000 +++ b/lisp/cedet/ede/proj-comp.el Sun Oct 04 14:25:42 2009 +0000 @@ -46,7 +46,7 @@ (require 'ede) ;source object (require 'ede/autoconf-edit) -(eval-when-compile (require 'ede/pmake)) +(declare-function ede-pmake-insert-variable-once "ede/pmake") ;;; Types: (defclass ede-compilation-program (eieio-instance-inheritor) @@ -253,6 +253,7 @@ (defmethod ede-proj-makefile-insert-variables ((this ede-compilation-program)) "Insert variables needed by the compiler THIS." + (require 'ede/pmake) (if (eieio-instance-inheritor-slot-boundp this 'variables) (with-slots (variables) this (mapcar