--- Makefile.distrib	2007/07/10 17:35:41	449
+++ Makefile.distrib	2007/07/10 17:35:49	450
@@ -9,7 +9,16 @@
   PACKAGES += -package pxp-lex-utf8
 endif
 
-SYNTAX = camlp4o pa_extend.cmo
+SYNTAX = camlp4o -I misc/ pa_extend.cmo \
+  q_symbol.cmo \
+  -symbol cduce_version=\"$(VERSION)\" \
+  -symbol build_date=\"$(shell date +%Y-%m-%d)\"
+
+ifeq ($(NATIVE), true)
+	SYNTAX += -symbol ocaml_compiler=\"native\"
+else
+	SYNTAX += -symbol ocaml_compiler=\"bytecode\"
+endif
 
 VERSION = 0.0.9
 
@@ -45,7 +54,6 @@
 # Objects to build
 
 OBJECTS = \
- misc/cduce_config.cmo \
  misc/state.cmo misc/pool.cmo misc/encodings.cmo misc/bool.cmo \
  misc/pretty.cmo \
  \
@@ -70,21 +78,11 @@
 DEPEND = $(DIRS:=/*.ml) $(DIRS:=/*.mli)
 INCLUDES = $(DIRS:%=-I %)
 
-PREPRO = $(SYNTAX) pr_o.cmo
-
-misc/cduce_config.cmo: misc/cduce_config.ml
-	$(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<
-	rm -f misc/cduce_config.ml
-
-misc/cduce_config.cmx: misc/cduce_config.ml
-	$(CAMLOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
-	rm -f misc/cduce_config.ml
-
-misc/cduce_config.ml:
-	sed -e 's|%%VERSION%%|$(VERSION)|' \
-            -e 's|%%BUILD_DATE%%|$(shell date +%Y-%m-%d)|' \
-            -e 's|%%NATIVE%%|$(NATIVE)|' \
-            misc/cduce_config.mlp > misc/cduce_config.ml
+#misc/cduce_config.ml:
+#	sed -e 's|%%VERSION%%|$(VERSION)|' \
+#           -e 's|%%BUILD_DATE%%|$(shell date +%Y-%m-%d)|' \
+#            -e 's|%%NATIVE%%|$(NATIVE)|' \
+#            misc/cduce_config.mlp > misc/cduce_config.ml
 
 
 cduce: $(CDUCE:.cmo=.$(EXTENSION))
@@ -97,9 +95,10 @@
 	$(LINK) -o $@ $^
 
 .PHONY: compute_depend
-compute_depend:
+compute_depend: misc/q_symbol.cmo
 	@echo "Computing dependencies ..."
-	ocamldep $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) > depend
+	ocamldep $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \
+        sed -e "s|: |: misc/q_symbol.cmo |" > depend
 
 parser/wlexer.ml: parser/wlexer.mll
 	wlex parser/wlexer.mll
@@ -118,6 +117,9 @@
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
 
+misc/q_symbol.cmo: misc/q_symbol.ml
+	$(CAMLC) -c $<
+
 .ml.cmo:
 	$(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<