Reorganize files

Author: minad

.elpaignore

@@ -3,7 +3,5 @@
 .gitignore
 LICENSE
 Makefile
-doc2texi.el
-gnuplot-debug-context.el
-gnuplot-test-context.el
-gnuplot-tests.el
+admin
+test

.gitignore

@@ -1,7 +1,7 @@
 *.elc
 *.tar.*
 *~
-\#*\#
 /*-autoloads.el
 /*-pkg.el
-/gnuplot-*/
+/admin/*/
+\#*\#

Makefile

@@ -1,20 +1,18 @@
-EMACS ?= emacs
-
 LOAD = -l gnuplot \
 	-l gnuplot-context \
 	-l gnuplot-debug-context \
 	-l gnuplot-gui \
-	-l gnuplot-tests
+	-l gnuplot-test
 
-.PHONY: all default clean
+.PHONY: all default clean regen test
 
 default: compile
 
 test:
-	$(EMACS) --batch -L . -f package-initialize $(LOAD) -f ert-run-tests-batch-and-exit
+	emacs --batch -L test -L . -f package-initialize $(LOAD) -f ert-run-tests-batch-and-exit
 
 compile:
-	$(EMACS) --batch -L . -f package-initialize -f batch-byte-compile gnuplot-*.el
+	emacs --batch -L test -L . -f package-initialize -f batch-byte-compile gnuplot-*.el test/gnuplot-*.el
 
 clean:
-	rm -f *.elc
+	rm -f *.elc */*.elc

README.org

@@ -137,22 +137,5 @@ until this issue is fixed upstream.
 
 The files ~gnuplot.texi~ and ~gnuplot-eldoc.el~ are generated from the Gnuplot
 source, which can be obtained from https://packages.debian.org/unstable/gnuplot.
-
-#+begin_src bash
-# Download and extract the Gnuplot source
-[ -e gnuplot-source.tar.xz ] || curl -o gnuplot-source.tar.xz http://deb.debian.org/debian/pool/main/g/gnuplot/gnuplot_6.0.2+dfsg1.orig.tar.xz
-rm -rf gnuplot-source/
-mkdir gnuplot-source
-tar --strip-components=1 -C gnuplot-source -xf gnuplot-source.tar.xz
-
-# Run doc2texi.el inside the gnuplot-source/docs directory
-cp doc2texi.el gnuplot-source/docs
-cd gnuplot-source/docs
-emacs -batch -l doc2texi.el -f d2t-doc-to-texi
-
-# Make sure that the info file compiles cleanly
-makeinfo --no-split gnuplot.texi
-
-# Copy the updated gnuplot-eldoc.el and gnuplot.texi to the package directory
-cp gnuplot.texi gnuplot-eldoc.el ../..
-#+end_src
+Run ~make~ inside the ~admin~ directory to download the source and regenerate the
+files.

admin/Makefile

@@ -0,0 +1,18 @@
+src = gnuplot-source
+
+regen:
+	# Download and extract the Gnuplot source
+	[ -e $(src).tar.xz ] || curl -o $(src).tar.xz http://deb.debian.org/debian/pool/main/g/gnuplot/gnuplot_6.0.2+dfsg1.orig.tar.xz
+	rm -rf $(src)/
+	mkdir $(src)
+	tar --strip-components=1 -C $(src) -xf $(src).tar.xz
+
+	# Run doc2texi.el inside the $(src)/docs directory
+	cp doc2texi.el $(src)/docs
+	(cd $(src)/docs; emacs --batch -l doc2texi.el -f d2t-doc-to-texi)
+
+	# Make sure that the info file compiles cleanly
+	(cd $(src)/docs; makeinfo --no-split gnuplot.texi)
+
+	# Copy the updated gnuplot-eldoc.el and gnuplot.texi to the package directory
+	cp $(src)/docs/gnuplot.texi $(src)/docs/gnuplot-eldoc.el ..

doc2texi.el renamed to admin/doc2texi.el

@@ -249,4 +249,4 @@ mutliple # lines #")
 'comment' \
 \"containing strings\"")
 
-;;; gnuplot-tests.el ends here
+;;; gnuplot-test.el ends here