-srcs := $(wildcard clsql/*.cl)
-srcs-base := $(wildcard clsql-base/*.cl)
-srcs-base-uffi := $(wildcard clsql-uffi/*.cl)
-srcs-base-uffi-so:= $(wildcard clsql-uffi/*.so)
-srcs-mysql := $(wildcard clsql-mysql/*.cl)
-srcs-mysql-so := $(wildcard clsql-mysql/*.so)
-srcs-pg := $(wildcard clsql-postgresql/*.cl)
-srcs-pg-socket := $(wildcard clsql-postgresql-socket/*.cl)
-srcs-aodbc := $(wildcard clsql-aodbc/*.cl)
+srcs := $(wildcard sql/*.cl) clsql.asd
+srcs-base := $(wildcard base/*.cl)
+srcs-uffi := $(wildcard uffi/*.cl) $(wildcard uffi/*.c)
+srcs-uffi-so := $(wildcard uffi/*.so)
+srcs-mysql := $(wildcard db-mysql/*.cl) $(wildcard db-mysql/*.c)
+srcs-mysql-so := $(wildcard db-mysql/*.so)
+srcs-pg := $(wildcard db-postgresql/*.cl)
+srcs-pg-socket := $(wildcard db-postgresql-socket/*.cl)
+srcs-aodbc := $(wildcard db-aodbc/*.cl)