From 4dd7ec150b91f2aba21eb42ea0cf8b5f80c1caa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu>
Date: Sat, 13 Aug 2016 12:51:43 +0200
Subject: [PATCH] example: ecl_qt: move files to qt/

After the first build stage movie files to the qt/ directory (covered
in *.lisp files and Makefile).
---
 examples/ecl_qt/Makefile          | 6 +++---
 examples/ecl_qt/README.md         | 5 +++--
 examples/ecl_qt/build_fasl.lisp   | 2 +-
 examples/ecl_qt/build_static.lisp | 2 +-
 examples/ecl_qt/qt/ecl_qtdemo.pro | 2 +-
 examples/ecl_qt/qt/main.cpp       | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/examples/ecl_qt/Makefile b/examples/ecl_qt/Makefile
index fca1ceeb4..50f131632 100644
--- a/examples/ecl_qt/Makefile
+++ b/examples/ecl_qt/Makefile
@@ -1,13 +1,13 @@
 all:lisp-envi.a hello-lisp-system--all-systems.fasb
 
 #lisp environment.
-lisp-envi.a: lisp-envi.asd lisp-envi.lisp build_static.lisp
+qt/lisp-envi.a: lisp-envi.asd lisp-envi.lisp build_static.lisp
 	ecl -load build_static.lisp
 
 #your lisp system.
-hello-lisp-system--all-systems.fasb: hello-lisp-system.asd hello-lisp.lisp \
+qt/hello-lisp-system--all-systems.fasb: hello-lisp-system.asd hello-lisp.lisp \
 build_fasl.lisp
 	ecl -load build_fasl.lisp
 
 clean:
-	-rm -f hello-lisp-system--all-systems.fasb lisp-envi.a
+	-rm -f qt/hello-lisp-system--all-systems.fasb qt/lisp-envi.a
diff --git a/examples/ecl_qt/README.md b/examples/ecl_qt/README.md
index 7c4c9dc0f..7145c51e9 100644
--- a/examples/ecl_qt/README.md
+++ b/examples/ecl_qt/README.md
@@ -17,8 +17,9 @@ that package in advance using `(ql:quickload :lparallel)`.
 
 ## Build CL Library and FASB
 
-Run `make` in current directory and you get two files, if
-successful. `lisp-envi.a` and `hello-lisp-system--all-systems.fasb`.
+Run `make` in current directory and you get two files in the directory
+`qt/` (if successful). `lisp-envi.a` and
+`hello-lisp-system--all-systems.fasb`.
 
 ## Configure and build your Qt Project
 
diff --git a/examples/ecl_qt/build_fasl.lisp b/examples/ecl_qt/build_fasl.lisp
index 1a0ac253a..ec7ac92cb 100644
--- a/examples/ecl_qt/build_fasl.lisp
+++ b/examples/ecl_qt/build_fasl.lisp
@@ -4,5 +4,5 @@
 (asdf:make-build :hello-lisp-system
                  :type :fasl
                  :monolithic t
-                 :move-here "./")
+                 :move-here "qt/")
 (quit)
diff --git a/examples/ecl_qt/build_static.lisp b/examples/ecl_qt/build_static.lisp
index 375b233ce..9d0588e73 100644
--- a/examples/ecl_qt/build_static.lisp
+++ b/examples/ecl_qt/build_static.lisp
@@ -3,6 +3,6 @@
 
 (asdf:make-build :lisp-envi
                  :type :static-library
-                 :move-here "./")
+                 :move-here "qt/")
 (quit)
 
diff --git a/examples/ecl_qt/qt/ecl_qtdemo.pro b/examples/ecl_qt/qt/ecl_qtdemo.pro
index 70e42dbe4..d3cb849ca 100644
--- a/examples/ecl_qt/qt/ecl_qtdemo.pro
+++ b/examples/ecl_qt/qt/ecl_qtdemo.pro
@@ -29,7 +29,7 @@ QMAKE_CFLAGS += `ecl-config --cflags`
 QMAKE_LFLAGS += `ecl-config --ldflags` -lecl
 
 # Lisp library written by a user
-LIBS += $$_PRO_FILE_PWD_/../lisp-envi.a
+LIBS += $$_PRO_FILE_PWD_/lisp-envi.a
 
 
 RESOURCES += \
diff --git a/examples/ecl_qt/qt/main.cpp b/examples/ecl_qt/qt/main.cpp
index 330662a46..7c848db0a 100644
--- a/examples/ecl_qt/qt/main.cpp
+++ b/examples/ecl_qt/qt/main.cpp
@@ -2,7 +2,7 @@
 #include <QApplication>
 #include "cl_bridge_utils.hpp"
 
-string  CL_MAIN_FASB = "\"../hello-lisp-system--all-systems.fasb\"";
+string  CL_MAIN_FASB = "\"hello-lisp-system--all-systems.fasb\"";
 string  CL_MAIN_PACKAGE_NAME = "hello-lisp";
 
 /* Initialization.