[build] rearrange Makefiles and META to work with the simpler layout

Makefile

@@ -2,40 +2,19 @@
 
 .PHONY: all
 all:
-	$(MAKE) -C hash/
-	$(MAKE) -C hash/ reinstall
-
-	$(MAKE) -C weakid/
-	$(MAKE) -C weakid/ reinstall
-
-	$(MAKE) -C type-of/
-	$(MAKE) -C type-of/ reinstall
-
-	$(MAKE) -C value/
-	$(MAKE) -C value/ reinstall
-
 	$(MAKE) -C lib/
-	$(MAKE) -C lib/ reinstall
-
-	$(MAKE) -C lib_test/
 
 .PHONY: test
-test:
-	$(MAKE) -C hash/test/
-	$(MAKE) -C type-of/test/
-	$(MAKE) -C value/test/
+test: all
+	$(MAKE) -C lib/
 	$(MAKE) -C lib_test/ run
-	$(MAKE) -C lib_test/ slow
 
 .PHONY: install
 install: all
+	$(MAKE) -C lib/ install
 
 .PHONY: uninstall
 uninstall:
-	$(MAKE) -C hash/ uninstall
-	$(MAKE) -C weakid/ uninstall
-	$(MAKE) -C type-of/ uninstall
-	$(MAKE) -C value/ uninstall
 	$(MAKE) -C lib/ uninstall
 
 .PHONY: reinstall
@@ -45,10 +24,4 @@ reinstall:
 
 .PHONY: clean
 clean:
-	$(MAKE) -C hash/ clean
-	$(MAKE) -C weakid/ clean
-	$(MAKE) -C type-of/ clean
-	$(MAKE) -C value/ clean
 	$(MAKE) -C lib/ clean
-	$(MAKE) -C lib_test/ clean
-	$(MAKE) -C lib_test/ -f Makefile.debug clean

lib/META

@@ -1,16 +1,16 @@
 name = "orm"
 version = "0.5"
-description = "An Object-Relational Mapping layer to persist OCaml data" 
+description = "An Object-Relational Mapper (ORM) to persist and retrieve data" 
 requires = "orm.core"
 
 package "core" (
-  requires = "num, sqlite3, type-of, value, unix, weakid"
+  requires = "num, sqlite3, dyntype.type, dyntype.value, unix"
   archive(byte) = "orm.cma"
   archive(native) = "orm.cmxa"
 )
 
 package "syntax" (
-  requires = "orm.core, type-conv.syntax, camlp4, type-of.syntax, value.syntax, hash.syntax"
+  requires = "orm.core, dyntype.syntax, camlp4"
   description = "Syntax extension for ORM"
   archive(syntax, preprocessor) = "pa_orm.cma"
 )

lib/Makefile.orm

@@ -1,12 +1,12 @@
 export OCAMLMAKEFILE = ../OCamlMakefile
 
 ANNOTATE = yes
-SOURCES = custom_unix_stubs.c sql_backend.ml sql_init.ml sql_save.ml sql_get.ml sql_delete.ml sql_cache.ml db.ml
+SOURCES = custom_unix_stubs.c weakid.ml sql_backend.ml sql_init.ml sql_save.ml sql_get.ml sql_delete.ml sql_cache.ml db.ml
 RESULT = orm
-PACKS = sqlite3 type-of value
+PACKS = sqlite3 dyntype.syntax
 LIB_PACK_NAME = orm
 
-LIBINSTALL_FILES = orm.cmx orm.cmxa orm.cma orm.cmi orm.a dllorm_stubs.so liborm_stubs.a syntax/pa_orm.cma
+LIBINSTALL_FILES = orm.cmx orm.cmxa orm.cma orm.cmi orm.a dllorm_stubs.so liborm_stubs.a syntax/pa_orm.cma 
 
 .PHONY: all
 all: ncl dcl

lib/syntax/Makefile

@@ -1,8 +1,8 @@
 OCAMLMAKEFILE = ../../OCamlMakefile
 ANNOTATE = yes
 
-SOURCES = p4_utils.ml p4_orm.ml pa_orm.ml
-PACKS = type-conv weakid type-of.syntax value.syntax hash.syntax
+SOURCES = p4_hash.ml pa_hash.ml p4_utils.ml p4_orm.ml pa_orm.ml
+PACKS = type-conv dyntype.syntax
 RESULT = pa_orm
 USE_CAMLP4 = yes