[Gtk2hs-commit] gtk2hs/mk chsDepend.in,1.8,1.9

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21432/mk

Modified Files:
	chsDepend.in 
Log Message:
make chsDepend understand hierarchical modules names and change the dependency
of .hs files to be on the .chi files rather than the .chs files. This is how it
is done for .o and .hs files, that is, the .o file depends on the .hi files.


Index: chsDepend.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- chsDepend.in	21 Nov 2004 15:06:16 -0000	1.8
+++ chsDepend.in	18 Dec 2004 20:46:29 -0000	1.9
@@ -24,7 +24,7 @@
   FULLNAMEDEP=`echo "$FULLNAME" | $SED 's/\.chs/.dep/'`;
   FULLNAMEHS=`echo "$FULLNAME" | $SED 's/\.chs/.hs/'`;
   if test -f "$FULLNAME"; then
-    DEPS=`$GREP "{#import" $FULLNAME 2> /dev/null | $SED 's/^{#import \([a-zA-Z1-9]*\)#}.*/\1.chs/'`;
+    DEPS=`$GREP "{#import" $FULLNAME 2> /dev/null | $SED 'y/./\//;s/^{#import \([a-zA-Z1-9/]*\)#}.*/\1/'`;
     #echo Looking for dependent files: $DEPS
     DEPNAMES=;
     for DEP in $DEPS; do
@@ -32,9 +32,9 @@
       for DEPDIR in $SEARCHPATH; do
         DEPNAME=`echo "$DEPDIR/$DEP" | $SED 's%\.//*%%'`;
         #echo Looking for $DEP in $DEPDIR , i.e.: $DEPNAME
-        if test -f "$DEPNAME"; then
+        if test -f "$DEPNAME.chs"; then
           #echo Found $DEP in $DEPDIR
-	  DEPNAMES="$DEPNAMES $DEPNAME";
+	  DEPNAMES="$DEPNAMES $DEPNAME.chi";
 	  break;
         fi;
       done;