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 e951598ba555a7e33ec6cf333505ff50280ab184..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-2012
-;;   Free Software Foundation, Inc.
+;; 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.
@@ -55,7 +55,7 @@
 (defcustom project-am-compile-project-command nil
   "*Default command used to compile a project."
   :group 'project-am
-  :type 'string)
+  :type '(choice (const nil) string))
 
 (defcustom project-am-compile-target-command (concat ede-make-command " -k %s")
   "*Default command used to compile a project."
@@ -205,7 +205,7 @@ OT is the object target.  DIR is the directory to start in."
                                                         (oref amf targets))
                                      nil t))))
         ;; The input target might be new.  See if we can find it.
-        (amf (ede-load-project-file (oref ot path)))
+        (amf (ede-target-parent ot))
         (ot (object-assoc target 'name (oref amf targets)))
         (ofn (file-name-nondirectory (buffer-file-name))))
     (if (not ot)
@@ -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."
@@ -1014,4 +1010,8 @@ per file or in .dir-locals.el or similar."
 
 (provide 'ede/project-am)
 
+;; Local variables:
+;; generated-autoload-load-name: "ede/project-am"
+;; End:
+
 ;;; ede/project-am.el ends here