Update copyright year to 2015

[gnu-emacs] / lisp / cedet / ede / project-am.el

diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index 459959e220d1fa4fc7f8e2a65a35fc23a4391d93..75fd195105f827dc0a6e5b4876e9d4687e207950 100644 (file)
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -1,10 +1,10 @@
 ;;; project-am.el --- A project management scheme based on automake files.
 
-;; Copyright (C) 1998-2000, 2003, 2005, 2007-2013 Free Software
+;; Copyright (C) 1998-2000, 2003, 2005, 2007-2015 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 0.0.3
+;; Old-Version: 0.0.3
 ;; Keywords: project, make
 
 ;; This file is part of GNU Emacs.
@@ -409,7 +409,7 @@ Argument COMMAND is the command to use for compiling the target."
          (setq default-directory dd)
          (setq cmd (read-from-minibuffer
                     "Run (like this): "
-                    (concat (ede-target-name obj))))
+                    (concat "./" (ede-target-name obj))))
          (ede-shell-run-something obj cmd))
       (kill-buffer tb))))
 
@@ -428,12 +428,8 @@ Argument COMMAND is the command to use for compiling the target."
 If a given set of projects has already been loaded, then do nothing
 but return the project for the directory given.
 Optional ROOTPROJ is the root EDE project."
-  (let* ((ede-constructing t)
-        (amo (object-assoc (expand-file-name "Makefile.am" directory)
-                           'file ede-projects)))
-    (when (not amo)
-      (setq amo (project-am-load-makefile directory)))
-    amo))
+  ;; Just jump into creating the project from the Makefiles.
+  (project-am-load-makefile directory))
 
 (defun project-am-find-topmost-level (dir)
   "Find the topmost automakefile starting with DIR."