put files in different directories

Ignore-this: 2df11f9183d273759941b09dbec314c6

darcs-hash:20110920122950-c41ad-eec84c9824fc0077abec452a2d865990a443df63

_oasis

@@ -27,7 +27,7 @@ Library "optcomp"
   CompiledObject: byte
 
 Library utop
-  Path: src
+  Path: src/common
   Modules: UTop
   InternalModules: UTop_private
   BuildDepends: findlib, lambda-term (>= 1.1), lwt.syntax
@@ -36,14 +36,14 @@ Library utop
 
 Executable utop
   Install: true
-  Path: src
+  Path: src/console
   CompiledObject: byte
   MainIs: uTop_console_top.ml
   BuildDepends: utop, findlib, lambda-term, lwt.syntax
 
 Executable "utop-emacs"
   Install: true
-  Path: src
+  Path: src/emacs
   CompiledObject: byte
   MainIs: uTop_emacs_top.ml
   BuildDepends: utop, findlib, lambda-term, lwt.syntax, threads

_tags

@@ -1,10 +1,15 @@
 # -*- conf -*-
 
+# Use camlp4 on all files
 <**/*.ml>: syntax_camlp4o, pkg_lwt.syntax, pa_optcomp
+
+# Do not use optcomp on syntax extensions
 <syntax/*.ml>: -pa_optcomp
-<src/*>: use_compiler_libs, pkg_lambda-term, pkg_findlib
+
+# Needed for building toplevels
+<src/**>: use_compiler_libs, pkg_lambda-term, pkg_findlib
 <**/*.top>: use_utop
-<**/uTop_emacs_top.top>: pkg_threads
+<src/emacs/uTop_emacs_top.top>: pkg_threads
 
 # OASIS_START
 # OASIS_STOP