From a51a712b6a571a5ab0e0dc1d7b4be31c214eeca8 Mon Sep 17 00:00:00 2001
From: Dimitri Fontaine <dim@tapoueh.org>
Date: Tue, 21 Jan 2014 14:37:26 +0100
Subject: [PATCH] Fix asd dependencies, cleanup useless and misplaced
 compilation options.

---
 pgloader.asd     | 61 ++++++++++++++++++++++++++++++++++++++++--------
 src/package.lisp |  6 -----
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/pgloader.asd b/pgloader.asd
index d610c07..eed9ea2 100644
--- a/pgloader.asd
+++ b/pgloader.asd
@@ -35,31 +35,67 @@
     ((:module "src"
 	      :components
 	      ((:file "params")
+
 	       (:file "package" :depends-on ("params"))
-	       (:file "logs"    :depends-on ("package"))
-	       (:file "monitor" :depends-on ("package" "logs"))
-	       (:file "utils"   :depends-on ("package"))
+
+	       (:file "logs"    :depends-on ("package" "params"))
+
+	       (:file "monitor" :depends-on ("params"
+                                             "package"
+                                             "logs"))
+
+	       (:file "utils"   :depends-on ("params"
+                                             "package"
+                                             "monitor"))
 
 	       ;; those are one-package-per-file
 	       (:file "transforms")
-	       (:file "parser"    :depends-on ("package" "params" "transforms"))
-	       (:file "parse-ini" :depends-on ("package" "params"))
 	       (:file "queue"     :depends-on ("package"))
-	       (:file "archive"   :depends-on ("sources" "pgsql"))
+
+	       (:file "parser"    :depends-on ("package"
+                                               "params"
+                                               "transforms"
+                                               "utils"
+                                               "monitor"
+                                               "pgsql"))
+
+	       (:file "parse-ini" :depends-on ("package"
+                                               "params"
+                                               "utils"))
+
+	       (:file "archive"   :depends-on ("params"
+                                               "package"
+                                               "utils"
+                                               "sources"
+                                               "pgsql"))
 
 	       ;; package pgloader.pgsql
 	       (:module pgsql
-			:depends-on ("package" "params" "queue" "utils")
+			:depends-on ("package"
+                                     "params"
+                                     "queue"
+                                     "utils"
+                                     "logs"
+                                     "monitor")
 			:components
 			((:file "copy-format")
 			 (:file "queries")
 			 (:file "schema")
 			 (:file "pgsql"
-				:depends-on ("copy-format" "queries" "schema"))))
+				:depends-on ("copy-format"
+                                             "queries"
+                                             "schema"))))
 
 	       ;; Source format specific implementations
 	       (:module sources
-			:depends-on ("package" "pgsql" "utils" "queue" "transforms")
+			:depends-on ("params"
+                                     "package"
+                                     "pgsql"
+                                     "utils"
+                                     "logs"
+                                     "monitor"
+                                     "queue"
+                                     "transforms")
 			:components
 			((:file "sources")
 			 (:file "csv"     :depends-on ("sources"))
@@ -74,7 +110,12 @@
 
 	       ;; the main entry file, used when building a stand-alone
 	       ;; executable image
-	       (:file "main" :depends-on ("package" "parser" "sources"))))
+	       (:file "main" :depends-on ("params"
+                                          "package"
+                                          "monitor"
+                                          "utils"
+                                          "parser"
+                                          "sources"))))
 
      ;; to produce the website
      (:module "web"
diff --git a/src/package.lisp b/src/package.lisp
index e0b98c7..4ea2d1c 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -299,9 +299,3 @@
 	(com.informatimago.clext.character-sets charsets)
 	(py-configparser ini))
    do (rename-package package package nicknames))
-
-;;;
-;;; and recompile. Now you can pre-allocate the queue by passing a size to
-;;; MAKE-QUEUE. (You could pass a number before too, but it was ignored.)
-;;;
-(pushnew :lparallel.with-vector-queue *features*)