X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=debian%2Frules;h=29881dddbb70923adaa8c944ca03f262eed1ff03;hp=299e58efe5e370b275d38929b0c216198b1c5310;hb=8a8ee2d7d791b7a3efaed06420802a925d16fca3;hpb=8d558ce162d1360f92e4d65d054e2f61c786319e

diff --git a/debian/rules b/debian/rules
index 299e58e..29881dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,21 +3,21 @@
 plain-pkg	:= clsql
 
 pkg		:= cl-sql
-pkg-base	:= cl-sql-base
 pkg-uffi	:= cl-sql-uffi
 pkg-mysql	:= cl-sql-mysql
 pkg-pg		:= cl-sql-postgresql
 pkg-pg-socket	:= cl-sql-postgresql-socket
 pkg-aodbc	:= cl-sql-aodbc
+pkg-odbc	:= cl-sql-odbc
+pkg-sqlite	:= cl-sql-sqlite
 pkg-tests	:= cl-sql-tests
-all-pkgs	:= $(pkg) $(pkg-base) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc) $(pkg-tests)
+all-pkgs	:= $(pkg) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc) $(pkg-odbc) $(pkg-sqlite) $(pkg-tests)
 
 
 UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
 
 ## Lisp sources
 srcs		:= $(wildcard sql/*.lisp) clsql.asd
-srcs-base	:= $(wildcard base/*.lisp) 
 srcs-uffi	:= $(wildcard uffi/*.lisp) $(wildcard uffi/*.c)
 srcs-uffi-so	:= $(wildcard uffi/*.so)
 srcs-mysql	:= $(wildcard db-mysql/*.lisp) $(wildcard db-mysql/*.c)
@@ -25,6 +25,8 @@ srcs-mysql-so	:=  $(wildcard db-mysql/*.so)
 srcs-pg		:= $(wildcard db-postgresql/*.lisp)
 srcs-pg-socket	:= $(wildcard db-postgresql-socket/*.lisp)
 srcs-aodbc	:= $(wildcard db-aodbc/*.lisp)
+srcs-odbc	:= $(wildcard db-odbc/*.lisp)
+srcs-sqlite	:= $(wildcard db-sqlite/*.lisp)
 srcs-tests	:= $(wildcard tests/*.lisp)
 
 clc-base	:= usr/share/common-lisp
@@ -36,9 +38,7 @@ clc-clsql	:= $(clc-source)/$(plain-pkg)
 
 clc-sql		:= $(clc-source)/clsql
 lispdir-sql	:= $(clc-sql)/sql
-clc-base	:= $(clc-source)/clsql-base
-lispdir-base	:= $(clc-base)/base
-clc-uffi	 := $(clc-source)/clsql-uffi
+clc-uffi	:= $(clc-source)/clsql-uffi
 lispdir-uffi 	:= $(clc-uffi)/uffi
 sodir-uffi 	:= usr/lib/clsql
 clc-mysql	:= $(clc-source)/clsql-mysql
@@ -50,6 +50,10 @@ clc-pg-socket 	:= $(clc-source)/clsql-postgresql-socket
 lispdir-pg-socket := $(clc-pg-socket)/db-postgresql-socket
 clc-aodbc	:= $(clc-source)/clsql-aodbc
 lispdir-aodbc	:= $(clc-aodbc)/db-aodbc
+clc-odbc	:= $(clc-source)/clsql-odbc
+lispdir-odbc	:= $(clc-odbc)/db-odbc
+clc-sqlite	:= $(clc-source)/clsql-sqlite
+lispdir-sqlite	:= $(clc-sqlite)/db-sqlite
 clc-tests	:= $(clc-source)/clsql-tests
 lispdir-tests	:= $(clc-tests)/tests
 
@@ -93,25 +97,23 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+
 	# Add here commands to install the package into debian/uffi.
 	dh_installdirs --all  $(clc-systems) $(clc-source)
 	dh_installdirs -p $(pkg) $(lispdir-sql)
-	dh_installdirs -p $(pkg-base) $(lispdir-base)
 	dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-uffi)
 	dh_installdirs -p $(pkg-pg) $(lispdir-pg)
 	dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
 	dh_installdirs -p $(pkg-mysql) $(lispdir-mysql) $(sodir-mysql)
 	dh_installdirs -p $(pkg-aodbc) $(lispdir-aodbc)
+	dh_installdirs -p $(pkg-odbc) $(lispdir-odbc)
+	dh_installdirs -p $(pkg-sqlite) $(lispdir-sqlite)
 	dh_installdirs -p $(pkg-tests) $(lispdir-tests)
 
 	# Main package
 	dh_install -p $(pkg) $(srcs) $(lispdir-sql)
 	dh_install -p $(pkg) clsql.asd $(clc-clsql)
 
-	# Base
-	dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
-	dh_install -p $(pkg-base) clsql-base.asd $(clc-base)
-
 	# UFFI
 	dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
 	dh_install -p $(pkg-uffi) $(srcs-uffi-so) $(sodir-uffi)
@@ -127,18 +129,23 @@ install: build
 	dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.asd $(clc-pg-socket)
 	dh_install -p $(pkg-aodbc) $(srcs-aodbc) $(lispdir-aodbc)
 	dh_install -p $(pkg-aodbc) clsql-aodbc.asd $(clc-aodbc)
+	dh_install -p $(pkg-odbc) $(srcs-odbc) $(lispdir-odbc)
+	dh_install -p $(pkg-odbc) clsql-odbc.asd $(clc-odbc)
+	dh_install -p $(pkg-sqlite) $(srcs-sqlite) $(lispdir-sqlite)
+	dh_install -p $(pkg-sqlite) clsql-sqlite.asd $(clc-sqlite)
 
 	dh_install -p $(pkg-tests) $(srcs-tests) $(lispdir-tests)
 	dh_install -p $(pkg-tests) clsql-tests.asd $(clc-tests)
 
 	# CLC Systems
 	dh_link -p $(pkg) $(clc-clsql)/clsql.asd $(clc-systems)/clsql.asd
-	dh_link -p $(pkg-base) $(clc-base)/clsql-base.asd $(clc-systems)/clsql-base.asd
 	dh_link -p $(pkg-uffi) $(clc-uffi)/clsql-uffi.asd $(clc-systems)/clsql-uffi.asd
 	dh_link -p $(pkg-mysql) $(clc-mysql)/clsql-mysql.asd $(clc-systems)/clsql-mysql.asd
 	dh_link -p $(pkg-pg) $(clc-pg)/clsql-postgresql.asd $(clc-systems)/clsql-postgresql.asd
 	dh_link -p $(pkg-pg-socket) $(clc-pg-socket)/clsql-postgresql-socket.asd $(clc-systems)/clsql-postgresql-socket.asd
 	dh_link -p $(pkg-aodbc) $(clc-aodbc)/clsql-aodbc.asd $(clc-systems)/clsql-aodbc.asd
+	dh_link -p $(pkg-odbc) $(clc-odbc)/clsql-odbc.asd $(clc-systems)/clsql-odbc.asd
+	dh_link -p $(pkg-sqlite) $(clc-sqlite)/clsql-sqlite.asd $(clc-systems)/clsql-sqlite.asd
 	dh_link -p $(pkg-tests) $(clc-tests)/clsql-tests.asd $(clc-systems)/clsql-tests.asd
 
 	# Documentation
@@ -171,7 +178,7 @@ binary-indep: build install
 	dh_testroot -i
 #	dh_installdebconf -i
 	dh_installdocs -i
-	dh_installexamples -i
+	dh_installexamples -i examples/*
 	dh_installmenu -i
 #	dh_installlogrotate -i
 #	dh_installemacsen -i