Remove unnecessary let-bindings in bookmark.el (Bug#6515)

[bpt/emacs.git] / lisp / cedet / ede / proj-obj.el

diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index f3ededa..241ace2 100644 (file)
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -1,6 +1,6 @@
 ;;; ede/proj-obj.el --- EDE Generic Project Object code generation support
 
-;;; Copyright (C) 1998, 1999, 2000, 2005, 2008, 2009
+;;; Copyright (C) 1998, 1999, 2000, 2005, 2008, 2009, 2010
 ;;; Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
@@ -26,6 +26,7 @@
 ;; Handles a superclass of target types which create object code in
 ;; and EDE Project file.
 
+(eval-when-compile (require 'cl))
 (require 'ede/proj)
 (declare-function ede-pmake-varname "ede/pmake")
 
@@ -46,7 +47,7 @@
                                  ;; fortran or pascal can be added here
                                  ))
    (availablelinkers :initform (ede-g++-linker
-                               ede-gcc-linker
+                               ede-cc-linker
                                ede-gfortran-linker
                                ede-ld-linker
                                ;; Add more linker thingies here.
@@ -108,10 +109,10 @@ file.")
    :uselinker t)
   "Compiler for C sourcecode.")
 
-(defvar ede-gcc-linker
+(defvar ede-cc-linker
   (ede-linker
-   "ede-gcc-linker"
-   :name "gcc"
+   "ede-cc-linker"
+   :name "cc"
    :sourcetype '(ede-source-c)
    :variables  '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L."))
    :commands '("$(C_LINK) -o $@ $^")