* cedet/ede/proj-comp.el: Don't require ede/pmake at toplevel.

(ede-proj-makefile-insert-variables): Require ede/pmake.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78a7c638f41932f621b574749451e231abff56e9..95a8cd0f9268674f7b64a2d2b2b88f6dc552890c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index be91c25d5f082287c40e929f5fce7b3eb0b1a3c0..378d299cc9ea426d53ee9e9d4a4491b6a8803f52 100644 (file)
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -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 @@ This will prevent rules from creating duplicate variables or rules."
 
 (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