Browse Source

flattening out lisp directory structure

  all babel and babel/langs files now live in the base of the lisp directory.
Eric Schulte 10 years ago
parent
commit
d7b7025eac

+ 8 - 29
Makefile

@@ -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

lisp/babel/langs/ob-C.el → lisp/ob-C.el


lisp/babel/langs/ob-R.el → lisp/ob-R.el


lisp/babel/langs/ob-asymptote.el → lisp/ob-asymptote.el


lisp/babel/langs/ob-clojure.el → lisp/ob-clojure.el


lisp/babel/ob-comint.el → lisp/ob-comint.el


lisp/babel/langs/ob-css.el → lisp/ob-css.el


lisp/babel/langs/ob-ditaa.el → lisp/ob-ditaa.el


lisp/babel/langs/ob-dot.el → lisp/ob-dot.el


lisp/babel/langs/ob-emacs-lisp.el → lisp/ob-emacs-lisp.el


lisp/babel/ob-exp.el → lisp/ob-exp.el


lisp/babel/langs/ob-gnuplot.el → lisp/ob-gnuplot.el


lisp/babel/langs/ob-haskell.el → lisp/ob-haskell.el


lisp/babel/ob-keys.el → lisp/ob-keys.el


lisp/babel/langs/ob-latex.el → lisp/ob-latex.el


lisp/babel/ob-lob.el → lisp/ob-lob.el


lisp/babel/langs/ob-matlab.el → lisp/ob-matlab.el


lisp/babel/langs/ob-ocaml.el → lisp/ob-ocaml.el


lisp/babel/langs/ob-octave.el → lisp/ob-octave.el


lisp/babel/langs/ob-perl.el → lisp/ob-perl.el


lisp/babel/langs/ob-python.el → lisp/ob-python.el


lisp/babel/ob-ref.el → lisp/ob-ref.el


lisp/babel/langs/ob-ruby.el → lisp/ob-ruby.el


lisp/babel/langs/ob-sass.el → lisp/ob-sass.el


lisp/babel/langs/ob-screen.el → lisp/ob-screen.el


lisp/babel/langs/ob-sh.el → lisp/ob-sh.el


lisp/babel/langs/ob-sql.el → lisp/ob-sql.el


lisp/babel/langs/ob-sqlite.el → lisp/ob-sqlite.el


lisp/babel/ob-table.el → lisp/ob-table.el


lisp/babel/ob-tangle.el → lisp/ob-tangle.el


lisp/babel/ob.el → lisp/ob.el