CEDET (development tools) package merged.

[gnu-emacs] / lisp / cedet / semantic / bovine / make.el

diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el
index 1686ef2aa152cdc3ea0e8eacb9ce044d94724d89..9f3edcfbe9b6de448559c0322a4652adff449626 100644 (file)
--- a/lisp/cedet/semantic/bovine/make.el
+++ b/lisp/cedet/semantic/bovine/make.el
@@ -30,10 +30,10 @@
 (require 'semantic)
 (require 'semantic/bovine/make-by)
 (require 'semantic/analyze)
-(require 'semantic/format)
+(require 'semantic/dep)
 
-(eval-when-compile
-  (require 'semantic/dep))
+(declare-function semantic-analyze-possible-completions-default
+                 "semantic/analyze/complete")
 
 ;;; Code:
 (define-lex-analyzer semantic-lex-make-backslash-no-newline
@@ -179,6 +179,7 @@ This is the same as a regular prototype."
   "Return a list of possible completions in a Makefile.
 Uses default implementation, and also gets a list of filenames."
   (save-excursion
+    (require 'semantic/analyze/complete)
     (set-buffer (oref context buffer))
     (let* ((normal (semantic-analyze-possible-completions-default context))
           (classes (oref context :prefixclass))
@@ -230,9 +231,6 @@ Uses default implementation, and also gets a list of filenames."
   (setq semantic-lex-analyzer #'semantic-make-lexer)
   )
 
-;;;###autoload
-(add-hook 'makefile-mode-hook 'semantic-default-make-setup)
-
 (provide 'semantic/bovine/make)
 
 ;; Local variables: