X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=tools%2Focamlmoduledep.sh;h=2833671766cf2acf15d797991580a034fbda57e7;hp=befd4cdfd1b110a091b39017d2a0eb3ce1f195eb;hb=d7019c01a47613e258fccb127e6085cb91d26546;hpb=fa7e819743a4a6d008ec086dfdeb2e30df2da701

diff --git a/tools/ocamlmoduledep.sh b/tools/ocamlmoduledep.sh
index befd4cd..2833671 100755
--- a/tools/ocamlmoduledep.sh
+++ b/tools/ocamlmoduledep.sh
@@ -4,19 +4,20 @@
 PROG="$0"
 CMDLINE="$*"
 usage() {
-    echo "$PROG [-native] [-I dir .. -I dir] Module"
+    echo "$PROG [-inter] [-native] [-I dir .. -I dir] Module"
 }
 
 INCLUDES=""
 MODULES=""
 NATIVE=0
 INTER=0
+OCAMLWHERE=$(ocamlc -where)
 while true; do
     case $1 in
         -I)
-            dir=`echo "$2" | sed "s:^+:$(ocamlc -where)/:"`
+            dir=`echo "$2" | sed "s:^+:${OCAMLWHERE}/:"`
             INCLUDES="$INCLUDES
-$2"
+$dir"
             shift
             ;;
         -native)
@@ -43,18 +44,23 @@ else
     ext=cmo
 fi
 
+
 for MODULE in $MODULES; do
-    module="$(echo $MODULE | cut -b1 | tr A-Z a-z)$(echo $MODULE | cut -b2-)"
+    module="$(echo ${MODULE} | sed -e 's:\(.*\):\l\1:')"
     echo "$INCLUDES" | while read include; do
-        base="$include/$module"
-        if test -z "$include"; then continue; fi
+	if test -z "$include"; then continue; fi
+        base="${include}/${module}"
         if test  \( "$INTER" = "1" \) -a \( -f "$base".mli \) ; then
-                echo -n "$base"."cmi "
-        elif test -f "$base".ml -o -f "$base".mly -o -f "$base".mll -o -f "$base".pack; then
-            echo -n "$base"."$ext "
+	    ## if we want to depend only on cmi of a module
+            /bin/echo -n  "${base}"."cmi "
+        elif test -f "$base".ml -o -f "$base".mly -o -f "$base".mll -o -f "$base".pack -o -f "$base".ml.str; then
+	    ## else we depend on the implementation 
+            /bin/echo -n  "${base}"."${ext} "
             break
-        elif test -f "$base".mli; then
-            echo -n "$base"."cmi "
+        elif test -f "${base}".mli; then
+	    ## and fall back on depending on the cmi if the cmx is not available
+	    ## (which prevents cross-module inlining in the case of cmx)
+            /bin/echo -n  "${base}"."cmi "
             break
         fi
     done