# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1254666342 0
# Node ID 9248683abf3b84b63abc83c485d5f3a4b01e05b9
# Parent  236504656438af0203a443cbd9cf3fdbbcc27cf5
* cedet/ede/proj-comp.el:  Don't require ede/pmake at toplevel.
(ede-proj-makefile-insert-variables): Require ede/pmake.

diff -r 236504656438 -r 9248683abf3b lisp/ChangeLog
--- 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.
diff -r 236504656438 -r 9248683abf3b lisp/cedet/ede/proj-comp.el
--- 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