diff options
author | Eric Schulte <schulte.eric@gmail.com> | 2010-07-02 17:14:13 -0700 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2010-07-05 11:14:49 -0700 |
commit | d7b7025eac365c6e72e596bee0b3e232cb687592 (patch) | |
tree | dc1b4443ccf118837df8c3d78069559c26e86a0f | |
parent | 6e469f4afba4bf7d6e8983d1e4f3e981252f8f60 (diff) | |
download | org-mode-d7b7025eac365c6e72e596bee0b3e232cb687592.tar.gz |
flattening out lisp directory structure
all babel and babel/langs files now live in the base of the lisp directory.
-rw-r--r-- | Makefile | 37 | ||||
-rw-r--r-- | lisp/ob-C.el (renamed from lisp/babel/langs/ob-C.el) | 0 | ||||
-rw-r--r-- | lisp/ob-R.el (renamed from lisp/babel/langs/ob-R.el) | 0 | ||||
-rw-r--r-- | lisp/ob-asymptote.el (renamed from lisp/babel/langs/ob-asymptote.el) | 0 | ||||
-rw-r--r-- | lisp/ob-clojure.el (renamed from lisp/babel/langs/ob-clojure.el) | 0 | ||||
-rw-r--r-- | lisp/ob-comint.el (renamed from lisp/babel/ob-comint.el) | 0 | ||||
-rw-r--r-- | lisp/ob-css.el (renamed from lisp/babel/langs/ob-css.el) | 0 | ||||
-rw-r--r-- | lisp/ob-ditaa.el (renamed from lisp/babel/langs/ob-ditaa.el) | 0 | ||||
-rw-r--r-- | lisp/ob-dot.el (renamed from lisp/babel/langs/ob-dot.el) | 0 | ||||
-rw-r--r-- | lisp/ob-emacs-lisp.el (renamed from lisp/babel/langs/ob-emacs-lisp.el) | 0 | ||||
-rw-r--r-- | lisp/ob-exp.el (renamed from lisp/babel/ob-exp.el) | 0 | ||||
-rw-r--r-- | lisp/ob-gnuplot.el (renamed from lisp/babel/langs/ob-gnuplot.el) | 0 | ||||
-rw-r--r-- | lisp/ob-haskell.el (renamed from lisp/babel/langs/ob-haskell.el) | 0 | ||||
-rw-r--r-- | lisp/ob-keys.el (renamed from lisp/babel/ob-keys.el) | 0 | ||||
-rw-r--r-- | lisp/ob-latex.el (renamed from lisp/babel/langs/ob-latex.el) | 0 | ||||
-rw-r--r-- | lisp/ob-lob.el (renamed from lisp/babel/ob-lob.el) | 0 | ||||
-rw-r--r-- | lisp/ob-matlab.el (renamed from lisp/babel/langs/ob-matlab.el) | 0 | ||||
-rw-r--r-- | lisp/ob-ocaml.el (renamed from lisp/babel/langs/ob-ocaml.el) | 0 | ||||
-rw-r--r-- | lisp/ob-octave.el (renamed from lisp/babel/langs/ob-octave.el) | 0 | ||||
-rw-r--r-- | lisp/ob-perl.el (renamed from lisp/babel/langs/ob-perl.el) | 0 | ||||
-rw-r--r-- | lisp/ob-python.el (renamed from lisp/babel/langs/ob-python.el) | 0 | ||||
-rw-r--r-- | lisp/ob-ref.el (renamed from lisp/babel/ob-ref.el) | 0 | ||||
-rw-r--r-- | lisp/ob-ruby.el (renamed from lisp/babel/langs/ob-ruby.el) | 0 | ||||
-rw-r--r-- | lisp/ob-sass.el (renamed from lisp/babel/langs/ob-sass.el) | 0 | ||||
-rw-r--r-- | lisp/ob-screen.el (renamed from lisp/babel/langs/ob-screen.el) | 0 | ||||
-rw-r--r-- | lisp/ob-sh.el (renamed from lisp/babel/langs/ob-sh.el) | 0 | ||||
-rw-r--r-- | lisp/ob-sql.el (renamed from lisp/babel/langs/ob-sql.el) | 0 | ||||
-rw-r--r-- | lisp/ob-sqlite.el (renamed from lisp/babel/langs/ob-sqlite.el) | 0 | ||||
-rw-r--r-- | lisp/ob-table.el (renamed from lisp/babel/ob-table.el) | 0 | ||||
-rw-r--r-- | lisp/ob-tangle.el (renamed from lisp/babel/ob-tangle.el) | 0 | ||||
-rw-r--r-- | lisp/ob.el (renamed from lisp/babel/ob.el) | 0 |
31 files changed, 8 insertions, 29 deletions
@@ -18,8 +18,6 @@ prefix=/usr/local # Where local lisp files go. lispdir = $(prefix)/share/emacs/site-lisp -lispbdir = $(lispdir)/babel -lispbldir = $(lispbdir)/langs # Where info files go. infodir = $(prefix)/share/info @@ -31,11 +29,7 @@ infodir = $(prefix)/share/info # Using emacs in batch mode. BATCH=$(EMACS) -batch -q -no-site-file -eval \ - "(setq load-path (cons (expand-file-name\ - \"langs\"\ - (expand-file-name \"babel\" (expand-file-name \"./lisp/\")))\ - (cons (expand-file-name \"babel\" (expand-file-name \"./lisp/\"))\ - (cons (expand-file-name \"./lisp/\") (cons \"$(lispdir)\" load-path)))))" + "(setq load-path (cons (expand-file-name \"./lisp/\") (cons \"$(lispdir)\" load-path)))" # Specify the byte-compiler for compiling org-mode files ELC= $(BATCH) -f batch-byte-compile @@ -120,18 +114,16 @@ LISPF = org.el \ org-vm.el \ org-w3m.el \ org-wl.el \ - org-xoxo.el - -LISPBF = ob.el \ + org-xoxo.el \ + ob.el \ ob-table.el \ ob-lob.el \ ob-ref.el \ ob-exp.el \ ob-tangle.el \ ob-comint.el \ - ob-keys.el - -LISPBLF = ob-C.el \ + ob-keys.el \ + ob-C.el \ ob-ditaa.el \ ob-haskell.el \ ob-perl.el \ @@ -156,11 +148,8 @@ LISPBLF = ob-C.el \ LISPFILES0 = $(LISPF:%=lisp/%) LISPFILES = $(LISPFILES0) lisp/org-install.el -LISPBFILES = $(LISPBF:%=lisp/babel/%) -LISPBLFILES = $(LISPBLF:%=lisp/babel/langs/%) ELCFILES0 = $(LISPFILES0:.el=.elc) ELCFILES = $(LISPFILES:.el=.elc) -ELCBFILES = $(LISPBFILES:.el=.elc) DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir \ doc/pdflayout.sty doc/.nosearch \ doc/orgguide.texi doc/orgguide.pdf @@ -200,15 +189,10 @@ p: g: ${MAKE} pdf && open doc/orgguide.pdf -install-lisp: $(LISPFILES) $(LISPBFILES) $(ELCFILES) +install-lisp: $(LISPFILES) $(ELCFILES) if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ; - if [ ! -d $(lispbdir) ]; then $(MKDIR) $(lispbdir); else true; fi ; - if [ ! -d $(lispbldir) ]; then $(MKDIR) $(lispbldir); else true; fi ; $(CP) $(LISPFILES) $(lispdir) $(CP) $(ELCFILES) $(lispdir) - $(CP) $(LISPBFILES) $(lispbdir) - $(CP) $(ELCBFILES) $(lispbdir) - $(CP) $(LISPBLFILES) $(lispbldir) install-info: $(INFOFILES) if [ ! -d $(infodir) ]; then $(MKDIR) $(infodir); else true; fi ; @@ -224,13 +208,11 @@ install-noutline: xemacs/noutline.elc autoloads: lisp/org-install.el -lisp/org-install.el: $(LISPFILES0) $(LISPBFILES) Makefile +lisp/org-install.el: $(LISPFILES0) Makefile $(BATCH) --eval "(require 'autoload)" \ --eval '(find-file "org-install.el")' \ --eval '(erase-buffer)' \ - --eval '(mapc (lambda (x) (generate-file-autoloads (symbol-name x))) (quote ($(LISPFILES0) $(LISPBFILES))))' \ - --eval "(insert \"(add-to-list 'load-path (expand-file-name \\\"babel\\\" (file-name-directory (or load-file-name (buffer-file-name)))))\")" \ - --eval "(insert \"\n(add-to-list 'load-path (expand-file-name \\\"langs\\\" (expand-file-name \\\"babel\\\" (file-name-directory (or load-file-name (buffer-file-name))))))\")\n" \ + --eval '(mapc (lambda (x) (generate-file-autoloads (symbol-name x))) (quote ($(LISPFILES0))))' \ --eval '(insert "\n(provide (quote org-install))\n")' \ --eval '(save-buffer)' mv org-install.el lisp @@ -300,10 +282,7 @@ distfile: $(MKDIR) org-$(TAG)/xemacs $(MKDIR) org-$(TAG)/doc $(MKDIR) org-$(TAG)/lisp - $(MKDIR) org-$(TAG)/lisp/babel - $(MKDIR) org-$(TAG)/lisp/babel/langs cp -r $(LISPFILES) org-$(TAG)/lisp - cp -r $(LISPBFILES) org-$(TAG)/lisp/babel cp -r $(DOCFILES) $(CARDFILES) org-$(TAG)/doc cp -r $(DISTFILES_extra) org-$(TAG)/ cp -r README_DIST org-$(TAG)/README diff --git a/lisp/babel/langs/ob-C.el b/lisp/ob-C.el index 8930fa1..8930fa1 100644 --- a/lisp/babel/langs/ob-C.el +++ b/lisp/ob-C.el diff --git a/lisp/babel/langs/ob-R.el b/lisp/ob-R.el index 6a711e8..6a711e8 100644 --- a/lisp/babel/langs/ob-R.el +++ b/lisp/ob-R.el diff --git a/lisp/babel/langs/ob-asymptote.el b/lisp/ob-asymptote.el index 1415730..1415730 100644 --- a/lisp/babel/langs/ob-asymptote.el +++ b/lisp/ob-asymptote.el diff --git a/lisp/babel/langs/ob-clojure.el b/lisp/ob-clojure.el index 491a4ac..491a4ac 100644 --- a/lisp/babel/langs/ob-clojure.el +++ b/lisp/ob-clojure.el diff --git a/lisp/babel/ob-comint.el b/lisp/ob-comint.el index b60e8f1..b60e8f1 100644 --- a/lisp/babel/ob-comint.el +++ b/lisp/ob-comint.el diff --git a/lisp/babel/langs/ob-css.el b/lisp/ob-css.el index 5785622..5785622 100644 --- a/lisp/babel/langs/ob-css.el +++ b/lisp/ob-css.el diff --git a/lisp/babel/langs/ob-ditaa.el b/lisp/ob-ditaa.el index 6d0a584..6d0a584 100644 --- a/lisp/babel/langs/ob-ditaa.el +++ b/lisp/ob-ditaa.el diff --git a/lisp/babel/langs/ob-dot.el b/lisp/ob-dot.el index e22defd..e22defd 100644 --- a/lisp/babel/langs/ob-dot.el +++ b/lisp/ob-dot.el diff --git a/lisp/babel/langs/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el index 81ee22e..81ee22e 100644 --- a/lisp/babel/langs/ob-emacs-lisp.el +++ b/lisp/ob-emacs-lisp.el diff --git a/lisp/babel/ob-exp.el b/lisp/ob-exp.el index 59ad4af..59ad4af 100644 --- a/lisp/babel/ob-exp.el +++ b/lisp/ob-exp.el diff --git a/lisp/babel/langs/ob-gnuplot.el b/lisp/ob-gnuplot.el index 5060d66..5060d66 100644 --- a/lisp/babel/langs/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el diff --git a/lisp/babel/langs/ob-haskell.el b/lisp/ob-haskell.el index df3b72a..df3b72a 100644 --- a/lisp/babel/langs/ob-haskell.el +++ b/lisp/ob-haskell.el diff --git a/lisp/babel/ob-keys.el b/lisp/ob-keys.el index 2cc523a..2cc523a 100644 --- a/lisp/babel/ob-keys.el +++ b/lisp/ob-keys.el diff --git a/lisp/babel/langs/ob-latex.el b/lisp/ob-latex.el index 3c7b7cf..3c7b7cf 100644 --- a/lisp/babel/langs/ob-latex.el +++ b/lisp/ob-latex.el diff --git a/lisp/babel/ob-lob.el b/lisp/ob-lob.el index cc7596c..cc7596c 100644 --- a/lisp/babel/ob-lob.el +++ b/lisp/ob-lob.el diff --git a/lisp/babel/langs/ob-matlab.el b/lisp/ob-matlab.el index 63858bc..63858bc 100644 --- a/lisp/babel/langs/ob-matlab.el +++ b/lisp/ob-matlab.el diff --git a/lisp/babel/langs/ob-ocaml.el b/lisp/ob-ocaml.el index 66d285b..66d285b 100644 --- a/lisp/babel/langs/ob-ocaml.el +++ b/lisp/ob-ocaml.el diff --git a/lisp/babel/langs/ob-octave.el b/lisp/ob-octave.el index 8797b23..8797b23 100644 --- a/lisp/babel/langs/ob-octave.el +++ b/lisp/ob-octave.el diff --git a/lisp/babel/langs/ob-perl.el b/lisp/ob-perl.el index f34a88c..f34a88c 100644 --- a/lisp/babel/langs/ob-perl.el +++ b/lisp/ob-perl.el diff --git a/lisp/babel/langs/ob-python.el b/lisp/ob-python.el index 15857b7..15857b7 100644 --- a/lisp/babel/langs/ob-python.el +++ b/lisp/ob-python.el diff --git a/lisp/babel/ob-ref.el b/lisp/ob-ref.el index 85a29a2..85a29a2 100644 --- a/lisp/babel/ob-ref.el +++ b/lisp/ob-ref.el diff --git a/lisp/babel/langs/ob-ruby.el b/lisp/ob-ruby.el index d525bbe..d525bbe 100644 --- a/lisp/babel/langs/ob-ruby.el +++ b/lisp/ob-ruby.el diff --git a/lisp/babel/langs/ob-sass.el b/lisp/ob-sass.el index 7cf7015..7cf7015 100644 --- a/lisp/babel/langs/ob-sass.el +++ b/lisp/ob-sass.el diff --git a/lisp/babel/langs/ob-screen.el b/lisp/ob-screen.el index c784356..c784356 100644 --- a/lisp/babel/langs/ob-screen.el +++ b/lisp/ob-screen.el diff --git a/lisp/babel/langs/ob-sh.el b/lisp/ob-sh.el index 284164b..284164b 100644 --- a/lisp/babel/langs/ob-sh.el +++ b/lisp/ob-sh.el diff --git a/lisp/babel/langs/ob-sql.el b/lisp/ob-sql.el index 9429ce0..9429ce0 100644 --- a/lisp/babel/langs/ob-sql.el +++ b/lisp/ob-sql.el diff --git a/lisp/babel/langs/ob-sqlite.el b/lisp/ob-sqlite.el index a8180fc..a8180fc 100644 --- a/lisp/babel/langs/ob-sqlite.el +++ b/lisp/ob-sqlite.el diff --git a/lisp/babel/ob-table.el b/lisp/ob-table.el index 37ee327..37ee327 100644 --- a/lisp/babel/ob-table.el +++ b/lisp/ob-table.el diff --git a/lisp/babel/ob-tangle.el b/lisp/ob-tangle.el index 00e1faa..00e1faa 100644 --- a/lisp/babel/ob-tangle.el +++ b/lisp/ob-tangle.el diff --git a/lisp/babel/ob.el b/lisp/ob.el index 2f0cac9..2f0cac9 100644 --- a/lisp/babel/ob.el +++ b/lisp/ob.el |