Work in progress.

[jlisp] / Makefile

diff --git a/Makefile b/Makefile
index 2832b88..389b5c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-ABCL_JAR = /usr/local/src/abcl-0.0.10/abcl.jar
+ABCL_JAR = /home/mdw/src/abcl/abcl.jar
 JAVAC = javac
 JAR = jar
 GPL = /usr/share/common-licenses/GPL-2
 INSTALLER = setup-dep-ui.exe
 
-VERSION = 1.0.0
+VERSION = 1.2.0
 
 all: dep-ui.jar
 
@@ -35,10 +35,10 @@ dep-ui.jar: abcl.jar dep-ui.abcl $(SUBFILES) Startup.class
        mv tmp.jar $@
        rm -rf tmp.jar tmp
 
-jj.abcl swing.abcl queue.abcl dep.abcl:: dep-ui.abcl
-dep-ui.abcl: build.lisp \
-       jj.lisp swing.lisp queue.lisp dep.lisp dep-ui.lisp
-       abcl --load build.lisp
+jj.abcl ui-swing.abcl queue.abcl dep.abcl:: dep-ui.abcl
+dep-ui.abcl: dep-ui.asd jj.lisp ui-swing.lisp queue.lisp dep.lisp dep-ui.lisp
+       abcl --eval "(require :asdf)" \
+            --eval "(let ((sys:*compile-file-zip* nil)) (asdf:oos 'asdf:load-op :dep-ui) (exit))"
 
 GPL.dostxt: 
        cp $(GPL) $@.new
@@ -56,18 +56,18 @@ DISTDIR = dep-ui-$(VERSION)
 distdir:
        rm -rf $(DISTDIR)
        mkdir $(DISTDIR)
-       ln \
-               jj.lisp swing.lisp queue.lisp dep.lisp dep-ui.lisp \
-               run.lisp Startup.java rolling.lisp \
-               dep-ui.nsis \
-               $(DISTDIR)
+       for i in jj.lisp swing.lisp queue.lisp dep.lisp dep-ui.lisp \
+               run.lisp Startup.java rolling.lisp weak.lisp \
+               dep-ui.nsis; do \
+         ln -s ../$$i $(DISTDIR); \
+       done
 
 zip: distdir
        zip -r $(DISTDIR).zip $(DISTDIR)
        rm -rf $(DISTDIR)
 
 tar: distdir
-       tar cvfz $(DISTDIR).tar.gz $(DISTDIR)
+       tar chvfz $(DISTDIR).tar.gz $(DISTDIR)
        rm -rf $(DISTDIR)
 
 ### 
\ No newline at end of file