(generated-autoload-file): Don't set, instead use different values of

generate-autoload-cookie plus Makefile rules to allow for a mixture of
internal calendar autoloads and normal autoloads.

diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 3e227133e962fcb24c3d9bdd637fbdfac0d887e0..12612ac9ac7052a38b576cbcb7e707232b3ee88e 100644 (file)
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -76,7 +76,7 @@ Can be used to change frame parameters, such as font, color, location, etc."
 ;; calendar-basic-setup is called first, and will autoload diary-lib.
 (declare-function make-fancy-diary-buffer "diary-lib" nil)
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-one-frame-setup (&optional arg)
   "Start calendar and display it in a dedicated frame together with the diary.
 This function requires a display capable of multiple frames, else
@@ -108,7 +108,7 @@ passed to `calendar-basic-setup'."
               fancy-diary-buffer))
            t))))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-only-one-frame-setup (&optional arg)
   "Start calendar and display it in a dedicated frame.
 This function requires a display capable of multiple frames, else
@@ -131,7 +131,7 @@ ARG is passed to `calendar-basic-setup'."
           (calendar-basic-setup arg)
           (set-window-dedicated-p (selected-window) t))))))
 
-;;;###autoload
+;;;###cal-autoload
 (defun calendar-two-frame-setup (&optional arg)
   "Start calendar and diary in separate, dedicated frames.
 This function requires a display capable of multiple frames, else
@@ -183,9 +183,5 @@ ARG is passed to `calendar-basic-setup'."
 
 (provide 'cal-x)
 
-;; Local Variables:
-;; generated-autoload-file: "cal-loaddefs.el"
-;; End:
-
 ;; arch-tag: c6dbddca-ae84-442d-87fc-244b76e38e17
 ;;; cal-x.el ends here