Updated

git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2164 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e

2 files changed, 23 insertions, 18 deletions

diff --git a/cparser/.depend b/cparser/.depend
index 0b38315..4794656 100644
--- a/cparser/.depend
+++ b/cparser/.depend
@@ -1,31 +1,35 @@
 Bitfields.cmi: C.cmi
 Builtins.cmi: Env.cmi C.cmi
+C.cmi:
 Cerrors.cmi:
 Ceval.cmi: Env.cmi C.cmi
 Cleanup.cmi: C.cmi
-C.cmi:
 Cprint.cmi: C.cmi
 Cutil.cmi: Env.cmi C.cmi
 Elab.cmi: C.cmi
 Env.cmi: C.cmi
 GCC.cmi: Builtins.cmi
 Lexer.cmi: Parser.cmi
+Longlong.cmi: C.cmi
 Machine.cmi:
-Parse_aux.cmi:
+PackedStructs.cmi: C.cmi
 Parse.cmi: C.cmi
+Parse_aux.cmi:
 Parser.cmi: Cabs.cmo
 Rename.cmi: C.cmi
 StructReturn.cmi: C.cmi
 Transform.cmi: Env.cmi C.cmi
 Unblock.cmi: C.cmi
-Bitfields.cmo: Transform.cmi Machine.cmi Cutil.cmi C.cmi Bitfields.cmi
-Bitfields.cmx: Transform.cmx Machine.cmx Cutil.cmx C.cmi Bitfields.cmi
+Bitfields.cmo: Transform.cmi Machine.cmi Env.cmi Cutil.cmi Cerrors.cmi C.cmi \
+    Bitfields.cmi
+Bitfields.cmx: Transform.cmx Machine.cmx Env.cmx Cutil.cmx Cerrors.cmx C.cmi \
+    Bitfields.cmi
 Builtins.cmo: Env.cmi Cutil.cmi C.cmi Builtins.cmi
 Builtins.cmx: Env.cmx Cutil.cmx C.cmi Builtins.cmi
-Cabshelper.cmo: Cabs.cmo
-Cabshelper.cmx: Cabs.cmx
 Cabs.cmo:
 Cabs.cmx:
+Cabshelper.cmo: Cabs.cmo
+Cabshelper.cmx: Cabs.cmx
 Cerrors.cmo: Cerrors.cmi
 Cerrors.cmx: Cerrors.cmi
 Ceval.cmo: Machine.cmi Cutil.cmi C.cmi Ceval.cmi
@@ -48,20 +52,22 @@ GCC.cmo: Cutil.cmi C.cmi Builtins.cmi GCC.cmi
 GCC.cmx: Cutil.cmx C.cmi Builtins.cmx GCC.cmi
 Lexer.cmo: Parser.cmi Parse_aux.cmi Cabshelper.cmo Cabs.cmo Lexer.cmi
 Lexer.cmx: Parser.cmx Parse_aux.cmx Cabshelper.cmx Cabs.cmx Lexer.cmi
+Longlong.cmo: Transform.cmi Env.cmi Cutil.cmi Cerrors.cmi C.cmi Longlong.cmi
+Longlong.cmx: Transform.cmx Env.cmx Cutil.cmx Cerrors.cmx C.cmi Longlong.cmi
 Machine.cmo: Machine.cmi
 Machine.cmx: Machine.cmi
 Main.cmo: Parse.cmi GCC.cmi Cprint.cmi Builtins.cmi
 Main.cmx: Parse.cmx GCC.cmx Cprint.cmx Builtins.cmx
 PackedStructs.cmo: Transform.cmi Machine.cmi Env.cmi Cutil.cmi Cprint.cmi \
-    Cerrors.cmi C.cmi Builtins.cmi
+    Cerrors.cmi C.cmi Builtins.cmi PackedStructs.cmi
 PackedStructs.cmx: Transform.cmx Machine.cmx Env.cmx Cutil.cmx Cprint.cmx \
-    Cerrors.cmx C.cmi Builtins.cmx
-Parse_aux.cmo: Cerrors.cmi Cabshelper.cmo Parse_aux.cmi
-Parse_aux.cmx: Cerrors.cmx Cabshelper.cmx Parse_aux.cmi
-Parse.cmo: Unblock.cmi StructReturn.cmi Rename.cmi PackedStructs.cmo Elab.cmi \
+    Cerrors.cmx C.cmi Builtins.cmx PackedStructs.cmi
+Parse.cmo: Unblock.cmi StructReturn.cmi Rename.cmi PackedStructs.cmi Elab.cmi \
     Cerrors.cmi Bitfields.cmi Parse.cmi
 Parse.cmx: Unblock.cmx StructReturn.cmx Rename.cmx PackedStructs.cmx Elab.cmx \
     Cerrors.cmx Bitfields.cmx Parse.cmi
+Parse_aux.cmo: Cerrors.cmi Cabshelper.cmo Parse_aux.cmi
+Parse_aux.cmx: Cerrors.cmx Cabshelper.cmx Parse_aux.cmi
 Parser.cmo: Parse_aux.cmi Cabshelper.cmo Cabs.cmo Parser.cmi
 Parser.cmx: Parse_aux.cmx Cabshelper.cmx Cabs.cmx Parser.cmi
 Rename.cmo: Cutil.cmi Cerrors.cmi C.cmi Builtins.cmi Rename.cmi
diff --git a/cparser/Makefile b/cparser/Makefile
index 3a73ca7..1479992 100644
--- a/cparser/Makefile
+++ b/cparser/Makefile
@@ -19,7 +19,6 @@ SRCS=Cerrors.ml Cabs.ml Cabshelper.ml Parse_aux.ml Parser.ml Lexer.ml \
   Bitfields.ml PackedStructs.ml \
   Parse.ml
 
-COBJS=uint64.o
 BOBJS=$(SRCS:.ml=.cmo)
 NOBJS=$(SRCS:.ml=.cmx)
 IOBJS=$(INTFS:.mli=.cmi)
@@ -28,9 +27,9 @@ all: cparser.cma cparser.cmxa cparser cparser.byte
 
 install:
 	mkdir -p $(LIBDIR)
-	cp -p Cparser.cmi cparser.cma cparser.cmxa cparser.a libcparser.a dllcparser.so $(LIBDIR)
+	cp -p Cparser.cmi cparser.cma cparser.cmxa cparser.a $(LIBDIR)
 
-cparser: $(COBJS) $(NOBJS) Main.cmx
+cparser: $(NOBJS) Main.cmx
 	$(OCAMLOPT) -o cparser str.cmxa $(COBJS) $(NOBJS) Main.cmx
 
 clean::
@@ -42,11 +41,11 @@ cparser.byte: $(COBJS) $(BOBJS) Main.cmo
 clean::
 	rm -f cparser.byte
 
-cparser.cma libcparser.a: uint64.o Cparser.cmo 
-	$(OCAMLMKLIB) -o cparser uint64.o Cparser.cmo
+cparser.cma: Cparser.cmo 
+	$(OCAMLC) -a -o cparser.cma Cparser.cmo
 
-cparser.cmxa: uint64.o Cparser.cmx
-	$(OCAMLMKLIB) -o cparser uint64.o Cparser.cmx
+cparser.cmxa: Cparser.cmx
+	$(OCAMLOPT) -a -o cparser.cmxa Cparser.cmx
 
 Cparser.cmo Cparser.cmi: $(IOBJS) $(BOBJS)
 	$(OCAMLC) -pack -o Cparser.cmo $(IOBJS) $(BOBJS)