[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/pmake.el cedet/e...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/04 19:00:58

Modified files:
        lisp           : ChangeLog 
        lisp/cedet/ede : pmake.el proj-comp.el 

Log message:
        * cedet/ede/pmake.el (ede-pmake-insert-variable-once): Delete.
        
        * cedet/ede/proj-comp.el: Don't require ede/pmake at toplevel.
        (proj-comp-insert-variable-once): New macro, renamed from
        ede-pmake-insert-variable-once in ede/pmake.edl.
        (ede-proj-makefile-insert-variables): Use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16348&r2=1.16349
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/pmake.el?cvsroot=emacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/proj-comp.el?cvsroot=emacs&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16348
retrieving revision 1.16349
diff -u -b -r1.16348 -r1.16349
--- ChangeLog   4 Oct 2009 14:25:42 -0000       1.16348
+++ ChangeLog   4 Oct 2009 19:00:54 -0000       1.16349
@@ -1,7 +1,11 @@
 2009-10-04  Chong Yidong  <address@hidden>
 
+       * cedet/ede/pmake.el (ede-pmake-insert-variable-once): Delete.
+
        * cedet/ede/proj-comp.el:  Don't require ede/pmake at toplevel.
-       (ede-proj-makefile-insert-variables): Require ede/pmake.
+       (proj-comp-insert-variable-once): New macro, renamed from
+       ede-pmake-insert-variable-once in ede/pmake.edl.
+       (ede-proj-makefile-insert-variables): Use it.
 
 2009-10-04  Michael Albinus  <address@hidden>
 

Index: cedet/ede/pmake.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/pmake.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cedet/ede/pmake.el  3 Oct 2009 19:28:09 -0000       1.4
+++ cedet/ede/pmake.el  4 Oct 2009 19:00:58 -0000       1.5
@@ -255,18 +255,6 @@
      (goto-char (point-max))))
 (put 'ede-pmake-insert-variable-shared 'lisp-indent-function 1)
 
-(defmacro ede-pmake-insert-variable-once (varname &rest body)
-  "Add VARNAME into the current Makefile if it doesn't exist.
-Execute BODY in a location where a value can be placed."
-  `(let ((addcr t) (v ,varname))
-     (unless (re-search-backward (concat "^" v "\\s-*=") nil t)
-       (insert v "=")
-       ,@body
-       (if addcr (insert "\n"))
-       (goto-char (point-max)))
-     ))
-(put 'ede-pmake-insert-variable-once 'lisp-indent-function 1)
-
 ;;; SOURCE VARIABLE NAME CONSTRUCTION
 
 (defsubst ede-pmake-varname (obj)

Index: cedet/ede/proj-comp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/proj-comp.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cedet/ede/proj-comp.el      4 Oct 2009 14:25:46 -0000       1.6
+++ cedet/ede/proj-comp.el      4 Oct 2009 19:00:58 -0000       1.7
@@ -46,7 +46,6 @@
 
 (require 'ede)                         ;source object
 (require 'ede/autoconf-edit)
-(declare-function ede-pmake-insert-variable-once "ede/pmake")
 
 ;;; Types:
 (defclass ede-compilation-program (eieio-instance-inheritor)
@@ -251,14 +250,25 @@
   "Flush the configure file (current buffer) to accomodate THIS."
   nil)
 
+(defmacro proj-comp-insert-variable-once (varname &rest body)
+  "Add VARNAME into the current Makefile if it doesn't exist.
+Execute BODY in a location where a value can be placed."
+  `(let ((addcr t) (v ,varname))
+     (unless (re-search-backward (concat "^" v "\\s-*=") nil t)
+       (insert v "=")
+       ,@body
+       (if addcr (insert "\n"))
+       (goto-char (point-max)))
+     ))
+(put 'proj-comp-insert-variable-once 'lisp-indent-function 1)
+
 (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
         (lambda (var)
-          (ede-pmake-insert-variable-once (car var)
+          (proj-comp-insert-variable-once (car var)
             (let ((cd (cdr var)))
               (if (listp cd)
                   (mapc (lambda (c) (insert " " c)) cd)