Permalink
Browse files

Simplify build system.

* Remove bundled asdf, expect the user to have it installed
* Remove option to specify location of cl-ppcre, rely on asdf to load it
* Streamline decision about which lisp to use
  • Loading branch information...
1 parent ca08e08 commit 49377473397be3b8c5a3d5e1261b609c8fb56cd4 @dangerousben committed Jul 12, 2011
Showing with 22 additions and 1,328 deletions.
  1. +4 −4 Makefile.in
  2. +0 −1,285 asdf.lisp
  3. +17 −37 configure.ac
  4. +1 −2 make-image.lisp.in → make-image.lisp
View
@@ -1,14 +1,14 @@
LISP=@LISP_PROGRAM@
-clisp_BUILDOPTS=-K full -on-error exit ./make-image.lisp
+clisp_BUILDOPTS=-K full -on-error exit < ./make-image.lisp
sbcl_BUILDOPTS=--load ./make-image.lisp
ccl_BUILDOPTS=--load ./make-image.lisp
-ecl_BUILDOPTS=-norc -shell ./make-image.lisp
+ecl_BUILDOPTS=-shell ./make-image.lisp
-clisp_INFOOPTS=-K full -on-error exit -x "(require 'asdf '(\"asdf.lisp\")) (load \"stumpwm.asd\") (load \"@PPCRE_PATH@/cl-ppcre.asd\") (asdf:operate 'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\")) (stumpwm::generate-manual) (ext:exit)"
+clisp_INFOOPTS=-K full -on-error exit -x "(require 'asdf) (asdf:oos 'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\")) (stumpwm::generate-manual) (ext:exit)"
sbcl_INFOOPTS=--eval "(progn (require 'asdf) (require 'stumpwm) (load \"manual.lisp\"))" --eval "(progn (stumpwm::generate-manual) (sb-ext:quit))"
ccl_INFOOPTS=--eval "(progn (require 'asdf) (require 'stumpwm))" --load manual.lisp --eval "(progn (stumpwm::generate-manual) (quit))"
-ecl_INFOOPTS=-eval "(progn (require 'asdf) (load \"@PPCRE_PATH@/cl-ppcre.asd\") (require 'stumpwm) (load \"manual.lisp\"))" -eval "(progn (stumpwm::generate-manual) (ext:quit))"
+ecl_INFOOPTS=-eval "(progn (require 'asdf) (require 'stumpwm) (load \"manual.lisp\"))" -eval "(progn (stumpwm::generate-manual) (ext:quit))"
datarootdir = @datarootdir@
prefix=@prefix@
exec_prefix= @exec_prefix@
Oops, something went wrong.

0 comments on commit 4937747

Please sign in to comment.