Index: ede/Makefile
===================================================================
RCS file: /cvsroot/cedet/cedet/ede/Makefile,v
retrieving revision 1.1
diff -c -r1.1 Makefile
*** ede/Makefile	4 Sep 2003 19:35:47 -0000	1.1
--- ede/Makefile	10 Sep 2003 11:26:49 -0000
***************
*** 13,18 ****
--- 13,19 ----
  LOADPATH=../common/ ../speedbar/ ../eieio/\
     
  LOADDEFS=ede-loaddefs.el
+ LOADDIRS=.
  ede_LISP=project-am.el ede.el ede-pmake.el ede-pconf.el ede-proj.el ede-dired.el ede-proj-elisp.el ede-proj-misc.el ede-proj-obj.el ede-proj-prog.el ede-proj-archive.el ede-proj-shared.el ede-proj-info.el ede-proj-scheme.el ede-proj-aux.el ede-proj-comp.el ede-source.el ede-util.el ede-system.el ede-speedbar.el
  EMACS=emacs
  aux_lisp_LISP=autoconf-edit.el autoconf-compat.el
***************
*** 34,40 ****
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ .
  
  .PHONY: ede
  ede: $(ede_LISP)
--- 35,41 ----
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ $(LOADDIRS)
  
  .PHONY: ede
  ede: $(ede_LISP)
Index: ede/ede-proj-elisp.el
===================================================================
RCS file: /cvsroot/cedet/cedet/ede/ede-proj-elisp.el,v
retrieving revision 1.20
diff -c -r1.20 ede-proj-elisp.el
*** ede/ede-proj-elisp.el	4 Sep 2003 18:36:08 -0000	1.20
--- ede/ede-proj-elisp.el	10 Sep 2003 11:26:50 -0000
***************
*** 223,228 ****
--- 223,234 ----
  		  :documentation "The file that autoload definitions are placed in.
  There should be one load defs file for a given package.  The load defs are created
  for all Emacs Lisp sources that exist in the directory of the created target.")
+    (autoload-dirs :initarg :autoload-dirs
+ 		  :initform nil
+ 		  :type list
+ 		  :custom (repeat string)
+ 		  :documentation "The directories to scan for autoload definitions.
+ If nil defaults to the current directory.")
     )
    "Target that builds an autoload file.
  Files do not need to be added to this target.")
***************
*** 238,244 ****
       "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> $@-compile-script; \\"
       "done;"
       "@echo \"(require 'cedet-autogen)\" >> $@-compile-script"
!      "$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ ."
       )
     :sourcetype '(ede-source-emacs)
     )
--- 244,250 ----
       "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> $@-compile-script; \\"
       "done;"
       "@echo \"(require 'cedet-autogen)\" >> $@-compile-script"
!      "$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ $(LOADDIRS)"
       )
     :sourcetype '(ede-source-emacs)
     )
***************
*** 279,284 ****
--- 285,294 ----
    (call-next-method)
    (ede-pmake-insert-variable-shared "LOADDEFS"
      (insert (oref this autoload-file)))
+   (ede-pmake-insert-variable-shared "LOADDIRS"
+     (insert (mapconcat 'identity
+                        (or (oref this autoload-dirs) '("."))
+                        " ")))
    )
  
  (defmethod project-compile-target ((obj ede-proj-target-elisp-autoloads))
Index: eieio/Makefile
===================================================================
RCS file: /cvsroot/cedet/cedet/eieio/Makefile,v
retrieving revision 1.2
diff -c -r1.2 Makefile
*** eieio/Makefile	7 Sep 2003 02:06:49 -0000	1.2
--- eieio/Makefile	10 Sep 2003 11:26:50 -0000
***************
*** 10,17 ****
  ede_FILES=Project.ede Makefile
  
  EMACS=emacs
! LOADPATH=../common/ 
  LOADDEFS=eieio-defs.el
  eieio_LISP=eieio.el eieio-comp.el eieio-opt.el eieio-custom.el eieio-doc.el eieio-base.el
  EMACS=emacs
  examples_LISP=tree.el call-tree.el chart.el eieio-speedbar.el linemark.el lmcompile.el
--- 10,18 ----
  ede_FILES=Project.ede Makefile
  
  EMACS=emacs
! LOADPATH=../common/ ../speedbar/ 
  LOADDEFS=eieio-defs.el
+ LOADDIRS=.
  eieio_LISP=eieio.el eieio-comp.el eieio-opt.el eieio-custom.el eieio-doc.el eieio-base.el
  EMACS=emacs
  examples_LISP=tree.el call-tree.el chart.el eieio-speedbar.el linemark.el lmcompile.el
***************
*** 33,39 ****
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ .
  
  .PHONY: eieio
  eieio: $(eieio_LISP)
--- 34,40 ----
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ $(LOADDIRS)
  
  .PHONY: eieio
  eieio: $(eieio_LISP)
Index: eieio/Project.ede
===================================================================
RCS file: /cvsroot/cedet/cedet/eieio/Project.ede,v
retrieving revision 1.11
diff -c -r1.11 Project.ede
*** eieio/Project.ede	7 Sep 2003 02:05:39 -0000	1.11
--- eieio/Project.ede	10 Sep 2003 11:26:50 -0000
***************
*** 15,20 ****
--- 15,21 ----
      :path ""
      :source '("eieio.el" "eieio-comp.el" "eieio-opt.el" "eieio-custom.el" "eieio-doc.el" "eieio-base.el")
      :versionsource '("eieio.el")
+     :aux-packages '("speedbar")
      )
     (ede-proj-target-elisp "examples"
      :name "examples"
Index: semantic/Makefile
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/Makefile,v
retrieving revision 1.20
diff -c -r1.20 Makefile
*** semantic/Makefile	7 Sep 2003 02:17:55 -0000	1.20
--- semantic/Makefile	10 Sep 2003 11:26:50 -0000
***************
*** 14,19 ****
--- 14,20 ----
     ../common/ ../speedbar/ ../ede/ ../eieio/\
     
  LOADDEFS=semantic-al.el
+ LOADDIRS=. bovine wisent
  maintenance_LISP=semantic-ede-grammar.el
  EMACS=emacs
  wy_MISC=semantic-grammar.wy
***************
*** 39,45 ****
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ .
  
  .PHONY: maintenance
  maintenance: $(maintenance_LISP)
--- 40,46 ----
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ $(LOADDIRS)
  
  .PHONY: maintenance
  maintenance: $(maintenance_LISP)
Index: semantic/Project.ede
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/Project.ede,v
retrieving revision 1.43
diff -c -r1.43 Project.ede
*** semantic/Project.ede	7 Sep 2003 02:15:53 -0000	1.43
--- semantic/Project.ede	10 Sep 2003 11:26:50 -0000
***************
*** 9,14 ****
--- 9,15 ----
      :name "autoloads"
      :path ""
      :autoload-file "semantic-al.el"
+     :autoload-dirs '("." "bovine" "wisent")
      )
     (ede-proj-target-elisp "maintenance"
      :name "maintenance"
Index: speedbar/Makefile
===================================================================
RCS file: /cvsroot/cedet/cedet/speedbar/Makefile,v
retrieving revision 1.1
diff -c -r1.1 Makefile
*** speedbar/Makefile	7 Sep 2003 02:14:08 -0000	1.1
--- speedbar/Makefile	10 Sep 2003 11:26:50 -0000
***************
*** 12,17 ****
--- 12,18 ----
  EMACS=emacs
  LOADPATH=../common/ ../common/ 
  LOADDEFS=speedbar-defs.el
+ LOADDIRS=.
  speedbar_LISP=dframe.el speedbar.el
  EMACS=emacs
  info_TEXINFOS=speedbar.texi
***************
*** 33,39 ****
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ .
  
  .PHONY: speedbar
  speedbar: $(speedbar_LISP)
--- 34,40 ----
  	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
  	done;
  	@echo "(require 'cedet-autogen)" >> $@-compile-script
! 	$(EMACS) -batch -l $@-compile-script -f cedet-batch-update-autoloads $@ $(LOADDIRS)
  
  .PHONY: speedbar
  speedbar: $(speedbar_LISP)