From 8b2b2af0767caca8bc9db0613c75fbd737257d8a Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Fri, 23 May 2014 16:00:51 +0200 Subject: [PATCH] Use quicklisp release of qmynd and improve source dependencies. As seen in #64 it's no longer necessary anymore to use a local clone of qmynd to be able to compile pgloader: simplify the Makefile accordingly. In passing, add source level dependencies so that if you edit any source lisp file the binary will get automatically rebuilt by `make`. --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fbc6ee5..54e5ef9 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,11 @@ VERSION = 3.0.99 # use either sbcl or ccl CL = sbcl +LISP_SRC = $(wildcard src/*lisp) \ + $(wildcard src/pgsql/*lisp) \ + $(wildcard src/sources/*lisp) \ + pgloader.asd + BUILDDIR = build LIBS = $(BUILDDIR)/libs.stamp QLDIR = $(BUILDDIR)/quicklisp @@ -49,12 +54,6 @@ clean: docs: ronn -roff pgloader.1.md -$(QLDIR)/local-projects/qmynd: - git clone https://github.com/qitab/qmynd.git $@ - -qmynd: $(QLDIR)/local-projects/qmynd - cd $< && git pull - $(QLDIR)/setup.lisp: mkdir -p $(BUILDDIR) curl -o $(BUILDDIR)/quicklisp.lisp http://beta.quicklisp.org/quicklisp.lisp @@ -95,7 +94,7 @@ $(BUILDAPP_SBCL): $(QLDIR)/setup.lisp buildapp: $(BUILDAPP) ; -$(PGLOADER): $(MANIFEST) $(BUILDAPP) qmynd +$(PGLOADER): $(MANIFEST) $(BUILDAPP) $(LISP_SRC) mkdir -p $(BUILDDIR)/bin $(BUILDAPP) --logfile /tmp/build.log \ $(BUILDAPP_OPTS) \