Use "-as" to put CompCert modules in a compcert.xxx namespace.

Simplified the scripts "coq" and "pg".
Updated deps.


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

1 files changed, 2 insertions, 4 deletions

diff --git a/coq b/coq
index ce3e1ed..ea08805 100755
--- a/coq
+++ b/coq
@@ -3,8 +3,7 @@
 # Use the Makefile to rebuild dependencies if needed
 # Recompile the modified file after coqide editing
 
-ARCH=`sed -n -e 's/^ARCH=//p' Makefile.config`
-VARIANT=`sed -n -e 's/^VARIANT=//p' Makefile.config`
+INCLUDES=`make print-includes`
 
 make -q ${1}o || {
   make -n ${1}o | grep -v "\\b${1}\\b" | \
@@ -13,5 +12,4 @@ make -q ${1}o || {
    done)
 }
 
-coqide -I lib -I common -I $ARCH/$VARIANT -I $ARCH -I backend -I cfrontend -I flocq -I flocq/Appli -I flocq/Calc -I flocq/Core -I flocq/Prop $1 \
-&& make ${1}o
+coqide $INCLUDES $1 && make ${1}o