[project @ 2000-08-02 15:39:11 by simonmar]

Remove the old mkdependHS cruft.

5 files changed, 4 insertions, 823 deletions

diff --git a/ghc/mk/config.mk b/ghc/mk/config.mk
index b2ea4bf469..2f9ba8d348 100644
--- a/ghc/mk/config.mk
+++ b/ghc/mk/config.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: config.mk,v 1.8 2000/07/18 17:09:02 simonmar Exp $
+# $Id: config.mk,v 1.9 2000/08/02 15:39:11 simonmar Exp $
 #
 # GHC project configuration
 #
@@ -11,8 +11,8 @@
 GhcMainDir = ghc
 GhcBinDistDirs = ghc hslibs
 GhcBinDistDocs = docs ghc/docs/set
-GhcBinDistPrlScripts = ghc-$(ProjectVersion) stat2resid
-GhcBinDistLibPrlScripts = mkdependHS
+GhcBinDistPrlScripts = ghc-$(ProjectVersion)
+GhcBinDistLibPrlScripts = ghc-asm ghc-split ghc-stats
 GhcBinDistBins = hp2ps
 
 include $(GhcMainDir)/mk/version.mk
diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index eb42077c04..e1943d6b1a 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.24 2000/07/18 17:34:52 rrt Exp $
+# $Id: paths.mk,v 1.25 2000/08/02 15:39:11 simonmar Exp $
 #
 # ghc project specific make variables
 #
@@ -25,7 +25,6 @@ GHC_INCLUDE_DIR   	:= $(TOP)/includes
 GHC_UTILS_DIR	 	:= $(TOP)/utils
 GHC_INTERPRETER_DIR 	:= $(TOP)/interpreter
 
-GHC_MKDEPENDHS_DIR	:= $(GHC_UTILS_DIR)/mkdependHS
 GHC_HSC_DIR 		:= $(GHC_COMPILER_DIR)
 GHC_UNLIT_DIR 		:= $(GHC_UTILS_DIR)/unlit
 GHC_MANGLER_DIR 	:= $(GHC_DRIVER_DIR)/mangler
@@ -33,7 +32,6 @@ GHC_SPLIT_DIR	 	:= $(GHC_DRIVER_DIR)/split
 GHC_STAT_DIR            := $(GHC_DRIVER_DIR)/stats
 
 GHC_INPLACE		= $(GHC_DRIVER_DIR)/ghc-inplace
-GHC_MKDEPENDHS 		= $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
 GHC_HSC    		= $(GHC_HSC_DIR)/hsc$(EXE_SUFFIX)
 GHC_UNLIT		= $(GHC_UNLIT_DIR)/unlit$(EXE_SUFFIX)
 GHC_MANGLER		= $(GHC_MANGLER_DIR)/ghc-asm
diff --git a/ghc/utils/mkdependHS/Makefile b/ghc/utils/mkdependHS/Makefile
deleted file mode 100644
index 9d2f64f418..0000000000
--- a/ghc/utils/mkdependHS/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.21 2000/04/27 11:04:37 simonmar Exp $
-
-TOP=../..
-include $(TOP)/mk/boilerplate.mk
-
-INSTALLING=1
-
-boot :: all
-
-SCRIPT_SUBST_VARS= \
- TOP_PWD \
- INSTALLING \
- RAWCPP \
- HscIfaceFileVersion
-
-INTERP=perl
-
-INSTALLED_SCRIPT_PROG  = mkdependHS
-INPLACE_SCRIPT_PROG    = mkdependHS-inplace
-
-ifeq "$(INSTALLING)" "1"
-TOP_PWD 	:= $(prefix)
-SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
-else
-TOP_PWD 	:= $(FPTOOLS_TOP_ABS)
-SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
-endif
-
-SCRIPT_OBJS=mkdependHS.prl
-
-ifeq "$(BIN_DIST)" "1"
-SCRIPT_PREFIX_FILES += prefix.txt
-else
-SCRIPT_SUBST_VARS += libdir libexecdir datadir TMPDIR SED
-endif
-
-# don't recurse on 'make install'
-#
-ifeq "$(INSTALLING)" "1"
-all clean distclean mostlyclean maintainer-clean ::
-	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
-endif
-
-#
-# install setup
-#
-INSTALL_LIB_SCRIPTS += $(SCRIPT_PROG)
-
-include $(TOP)/mk/target.mk
diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl
deleted file mode 100644
index 47ec677092..0000000000
--- a/ghc/utils/mkdependHS/mkdependHS.prl
+++ /dev/null
@@ -1,756 +0,0 @@
-#
-# perl script expect the following variables to be prepended:
-#
-#  RAWCPP TMPDIR TOP_PWD HscIfaceFileVersion
-#  libdir libexecdir datadir INSTALLING
-#  SED 
-#
-# tries to work like mkdependC - capable of dealing with:
-#
-#  -literate Haskell code (Bird tracks or Glasgow literate style) (.lhs)
-#  -straight Haskell source (.hs)
-#  -literate or straight Happy specs    (.ly)
-#  
-# ToDo: strip out all the .h junk
-#
-($Pgm = $0) =~ s/.*\/([^\/]+)$/\1/;
-$Usage  = <<EOUSAGE;
-Usage: $Pgm [mkdependHS options] [-- GHC options --] srcfile1 [srcfile2 ...]
-
-Options recognised wherever they occur (mkdependHS or GHC):
-
-    -D<blah>	A cpp #define; usual meaning
-    -i<dirs>	Add <dirs> (colon-separated) to list of directories
-		to search for "import"ed modules
-    -I<dir>	Add <dir> to list of directories to search for
-		.h files (i.e., usual meaning)
-    -package <blah> This program uses this GHC system library; take
-		appropriate action (e.g., recognise when they are
-		"import"ing a module from that library).
-    -osuf <osuf> Use <osuf> as the "object file" suffix ( default: o)
-
-mkdependHS-specific options (not between --'s):
-
-    -v		Be verbose.
-    -v -v	Be very verbose.
-    -w          No warnings
-    -f blah	Use "blah" as the makefile, rather than "makefile"
-		or "Makefile".
-    -cpp	Wash the input files through cpp(1).
-    -s <suf>	Make extra dependencies for files with
-		suffix <suf><osuf>; thus, "-o hc -s _a" will
-		make dependencies both for .hc files and for .a_hc
-		files.  (Useful in conjunction with NoFib "ways".)
-    --exclude-module=<file> 
-                Regard <file> as "stable"; i.e., eXclude it from having
-		dependencies on it.
-    -x          same as --exclude-module
-    --exclude-directory=<dirs> 
-                Regard : separated list of directories as containing stable,
-                don't generate any dependencies on modules therein.
-    -Xdirs      same as --exclude-directory
-    --include-prelude
-		Regard prelude libraries as unstable, i.e., generate dependencies
-		on prelude modules. This option is normally only used by the
-                various system libraries. If a -package option is used, dependencies
-                will also be generated on the library's interfaces.
-    --include-module=<file> 
-                Regard <file> as not "stable"; i.e., generate dependencies
-                on it (if any). This option is normally used in conjunction 
-                with the --exclude-directory option.
-		
-EOUSAGE
-
-$Status     = 0; # just used for exit() status
-$Verbose    = 0; # 1 => verbose, 2 => very verbose
-$Warnings   = 1; # 1 => warn about duplicate interface files
-$Dashdashes_seen = 0;
-
-$Cpp = ${RAWCPP};
-$Cpp_flag_set = 0; # 1 => run cpp over input files.
-
-if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
-    $Tmp_prefix = $ENV{'TMPDIR'} . "/mkdependHS$$";
-} else {
-    $Tmp_prefix ="${TMPDIR}/mkdependHS$$";
-    $ENV{'TMPDIR'} = "${TMPDIR}"; # set the env var as well
-}
-
-$TopPwd	           = "${TOP_PWD}";
-$InstLibDirGhc     = "${libdir}";
-$InstLibExecDirGhc = "${libexecdir}";
-$InstDataDirGhc    = "${datadir}";
-
-$Unlit = ($INSTALLING) ? "${InstLibExecDirGhc}/unlit" 
-		       : "${TopPwd}/ghc/utils/unlit/unlit";
-
-$HiBootVersion = $HscIfaceFileVersion;
-$hi_boot_with_version = 0;
-
-$Begin_magic_str = "# DO NOT DELETE: Beginning of Haskell dependencies\n";
-$End_magic_str = "# DO NOT DELETE: End of Haskell dependencies\n";
-@Obj_suffix =  ("o");
-@File_suffix = ();
-
-$Import_dirs = '.';
-%Syslibs = ();
-%LibIfaces  = ();  # known prelude/syslib ifaces; read from a file
-%IgnoreMe = ();
-# directories to considered stable.
-@Ignore_dirs = ();
-
-%ModuleIn = ();
-
-$Include_dirs = '-I.';
-$Makefile = '';
-@Src_files = ();
-$Include_prelude = 0;
-@Defines = ();
-$ProcessingOptions=0;
-
-# Delete temp. file if script is halted.
-sub quit_upon_signal { print STDERR "Deleting $Tmp_prefix.hs .. \n"; unlink "$Tmp_prefix.hs"; }
-$SIG{'INT'}  = 'quit_upon_signal';
-$SIG{'QUIT'} = 'quit_upon_signal';
-
-&mangle_command_line_args(@ARGV);
-
-if ( $Status ) {
-    print stderr $Usage;
-    exit(1);
-}
-
-@Import_dirs  = split(/:/,$Import_dirs);
-@Include_dirs = split(/\s+/,$Include_dirs); # still has -I's in it
-
-# NB: We keep the scalar-variable equivalents to use in error messages
-
-&gather_import_dirs();
-
-if ( ! $Makefile && -f 'makefile' ) {
-    $Makefile = 'makefile';
-} elsif ( ! $Makefile && -f 'Makefile') {
-    $Makefile = 'Makefile';
-} elsif ( ! $Makefile) {
-    die "$Pgm: no makefile or Makefile found\n";
-}
-
-print STDERR "CPP defines=@Defines\n" if $Verbose;
-print STDERR "Import_dirs=@Import_dirs\n" if $Verbose;
-print STDERR "Include_dirs=@Include_dirs\n" if $Verbose;
-
-&preprocess_import_dirs();
-
-@Depend_lines = ();
-
-foreach $sf (@Src_files) {
-
-    # just like lit-inputter
-    # except it puts each file through CPP and
-    # a de-commenter (not implemented);
-    # builds up @Depend_lines
-    print STDERR "Here we go for source file: $sf\n" if $Verbose;
-    ($bf = $sf) =~ s/\.l?(hs|y)$//;
-
-    local($str)="";
-    foreach $obj  (@Obj_suffix) {
-  	$str .= "$bf.$obj ";
-        foreach $suff (@File_suffix) {
-	   $str .= "$bf.${suff}_$obj ";
-        }
-    }
-    push(@Depend_lines, "$str: $sf\n");
-    # if it's a literate file, .lhs or .ly? (happy specs), then we de-literatize it: 
-    if ( $sf !~ /\.l(hs|y)$/ ) {
-	$file_to_read = $sf;
-    } else {
-    	$file_to_read = "$Tmp_prefix.hs";
-	local($to_do) = "$Unlit $sf $file_to_read";
-	&run_something($to_do, $sf, 'unlit');
-    }
-    &slurp_file_for_imports($file_to_read, $sf);
-
-    # Delete the temporary.
-    if ( $sf =~ /\.l(hs|y)$/ ) {
-	unlink "$Tmp_prefix.hs";
-    }
-}
-
-#
-# print dependencies
-#
-if ( $Makefile eq "-" ) {
-   #
-   # print dependencies to STDOUT
-   #
-   &print_deps();
-} elsif ( ! -f $Makefile ) {
-   #
-   # $Makefile does not exist, just print the deps.
-   #
-   open(NMKF,"> $Makefile") || die "$Pgm: can't open $Makefile: $!\n";
-   select(NMKF);
-   &print_deps();
-   close(NMKF);
-} else {
-   #
-   # Create backup version of output file, then generate a new one.
-   # 
-   rename($Makefile,"$Makefile.bak") || die "$Pgm: can't rename $Makefile: $!\n";
-   
-   # now copy Makefile.bak into Makefile, rm'ing old dependencies
-   # and adding the new
-   open(OMKF,"< $Makefile.bak") || die "$Pgm: can't open $Makefile.bak: $!\n";
-   open(NMKF,"> $Makefile") || die "$Pgm: can't open $Makefile: $!\n";
-   select(NMKF);
-
-   $_ = <OMKF>;
-   while ($_ && $_ ne $Begin_magic_str) { # copy through, 'til Begin_magic_str
-       print $_;
-       $_ = <OMKF>;
-   }
-   while ($_ && $_ ne $End_magic_str) { # delete 'til End_magic_str
-       $_ = <OMKF>;
-   }
-
-   &print_deps();
-   
-   while (<OMKF>) { # copy the rest through
-       print $_ || die "Failed to write out dependencies ($!)";
-   }
-   close(NMKF) || exit(1);
-   close(OMKF) || exit(1);
-}
-
-exit 0;
-
-
-sub print_deps {
-    # insert dependencies
-    print "$Begin_magic_str", @Depend_lines, $End_magic_str || die "Failed to write out dependencies ($!)";
-}
-
-sub mangle_command_line_args {
-    local(@Args) = @_;
-        
-    while($_ = $Args[0]) {
-	shift(@Args);
-
-	if ( /^--$/ ) {
-	    $Dashdashes_seen++;
-
-	} elsif ( /^-D(.*)/ ) { # recognized wherever they occur
-	    push(@Defines, $_);
-	} elsif ( /^-cpp$/ ) { # recognized wherever they occur
-	    $Cpp_flag_set =1; 
-	} elsif ( /^-i$/ ) {
-	    $Import_dirs = ''; # import path cleared!
-	} elsif ( /^-i(.*)/ ) {
-	    $Import_dirs = "$1:$Import_dirs";
-	} elsif ( /^-I/ ) {
-	    $Include_dirs .= " $_";
-	} elsif ( /^-syslib$/ ) { # deprecated, use -syslib
-	    push(@Syslibs, &grab_arg_arg(*Args,$_,''));
-	} elsif ( /^-package$/ ) {
-	    push(@Syslibs, &grab_arg_arg(*Args,$_,''));
-	} elsif ( /^-fglasgow-exts$/ ) {
-	    push(@Syslibs, 'lang');
-	} elsif ( /^-concurrent$/ ) {
-	    push(@Syslibs, 'concurrent');
-	} elsif (/^-#include(.*)/) {
-	    &grab_arg_arg(*Args,'-#include',$1);
-	} elsif ( /^-osuf(.*)/ ) {
-	    local($suff)	= &grab_arg_arg(*Args,'-osuf',$1);
-	    # Weed out existing entry .. there must be a better way of doing this
-	    # with arrays (non-assoc) ! -- sof
-	    @Obj_suffix	= grep(!/$suff/,@Obj_suffix);
-	    push(@Obj_suffix, $suff);
-
-	} elsif ($Dashdashes_seen != 1) { # not between -- ... --
-	    if ( /^-v$/ ) {
-		$Verbose++;
-	    } elsif ( /^-w$/ ) {
-		$Warnings     = 0;
-	    } elsif ( /^-f(.*)/ && !$ProcessingOptions ) {
-		$Makefile	= &grab_arg_arg(*Args,'-f',$1);
-            #
-	    # --exclude-module=mod => it's stable, trust me!
-	    } elsif ( /^-(x|-exclude-module=)(.*)/ ) { 
-		local($thing) = &grab_arg_arg(*Args,$1,$2);
-		$IgnoreMe{$thing} = 'Y';
-	    } elsif ( /^-(X|-exclude-directory=)(.*)/ ) { 
-		foreach $d ( split(/:/,&grab_arg_arg(*Args,$1, $2)) ) {
-                   push(@Ignore_dirs,"$d");
-                }
-	    } elsif ( /^--include-module=(.*)/ ) { 
-		local($thing) = &grab_arg_arg(*Args,$1,$2);
-		$IgnoreMe{$thing} = 'n';
-	    } elsif ( /^--include-prelude$/ ) { 
-		$Include_prelude = 1;
-	    } elsif ( /^-s(.*)/ ) {
-		local($suff)	=  &grab_arg_arg(*Args,'-s',$1);
-		push(@File_suffix, $suff);
-	    } elsif ( /^-/ ) {
-		if (!$ProcessingOptions) {
-		   print STDERR "$Pgm: unknown option ignored: $_\n";
-		   $Status++;
-	        }
-	    } else {
-		push(@Src_files, $_);
-	    }
-        }
-        # Removed support for picking up plausible source file 
-        # names inside the ghc options chunk of the command
-        # line. It failed to deal with `option-value' stuff present
-        # on some invocations of ghc (e.g., "-ohi foo.baz").
-        #  -- sof 12/97
-	#
-	# } elsif ($Dashdashes_seen == 1) {
-	#     push(@Src_files, $_) if ! /^-/;
-	# }
-    }
-    @File_suffix = sort (@File_suffix);
-}
-
-sub grab_arg_arg {
-    local(*Args, $option, $rest_of_arg) = @_;
-    
-    if ($rest_of_arg) {
-	return($rest_of_arg);
-    } elsif ($#Args >= 0) {
-	local($temp) = $Args[0]; shift(@Args); 
-	return($temp);
-    } else {
-	print STDERR "$Pgm: no argument following $option option\n";
-	$Status++;
-    }
-}
-
-sub gather_import_dirs {
-
-	# set up array of ignored modules
-	local(@dirs) = ($INSTALLING) ? 
-    		       ("$InstLibDirGhc/imports/std")
-	     	     : ("$TopPwd/ghc/lib/std");
-
-	if (!$Include_prelude) {
-    	   push(@Ignore_dirs, @dirs);
-	} else {
-    	   push(@Import_dirs, @dirs);
-        }
-
-	foreach $lib ( @Syslibs ) {
-	   local($dir);
-
-           # Yuck ^ 2
-           if ( $lib eq 'lang' && ! $INSTALLING ) {
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/monads");
-	   }
-           if ( $lib eq 'text' && ! $INSTALLING ) {
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/html");
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/haxml/lib");
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/parsec");
-	   }
-           if ( $lib eq 'data' && ! $INSTALLING ) {
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison");
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison/Assoc");
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison/Coll");
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison/Seq");
-	   }
-           if ( $lib eq 'util' && ! $INSTALLING ) {
-              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/check");
-	   }
-
-           # Yuck ^ 3
-           if ( $lib eq 'win32' && ! $INSTALLING ) {
-              $dir = "${TopPwd}/hslibs/${lib}/src";
-           } elsif ( $lib eq 'greencard' && ! $INSTALLING ) {
-              $dir = "${TopPwd}/green-card/lib/ghc";
-           } elsif ( $lib eq 'com' && ! $INSTALLING ) {
-              $dir = "${TopPwd}/hdirect/lib";
-           } else {
-              $dir = ($INSTALLING) ? "${InstLibDirGhc}/imports/${lib}" 
-	                           : "${TopPwd}/hslibs/${lib}";
-           }
-
-    	   if (!$Include_prelude) {
-              push(@Ignore_dirs,$dir);
-           } else {
-              push(@Import_dirs, $dir);
-           }
-	}
-}
-
-
-
-sub preprocess_import_dirs {
-    # it's probably cheaper to find out what's in all
-    # the @Import_dirs before we start processing.
-    local($d, $thing);
-    local($_);
-
-    foreach $d ( @Import_dirs ) {
-        # Check to see if it can be ignored
-        #print STDERR "Ignore imports from $d\n" if $Verbose && $Ignore_dirs{$d};
-        #next if $Ignore_dirs{$d};
-
-	opendir(DIR, $d) || die "$Pgm: can't open directory $d\n";
-
-	for ($_ = readdir(DIR); $_; $_ = readdir(DIR)) {
-	    next unless /(.*)\.hi$/;
-	    $thing = $1;
-	    if ($ModuleIn{$thing} && $ModuleIn{$thing} ne $d) {
-		print STDERR "$Pgm: warning: $thing.hi appears in both $ModuleIn{$thing} and $d!\n" if ($Warnings);
-	    } else {
-		$ModuleIn{$thing} = $d;
-	    }
-	}
-	closedir(DIR); # No, don't check the error code
-    }
-
-    # Add all the modules
-    # to the IgnoreMe array before we start scanning for imports.
-    foreach $d (@Ignore_dirs) {
-
-	opendir(DIR, $d) || die "$Pgm: can't open directory $d\n";
-
-        for ($_ = readdir(DIR); $_; $_ = readdir(DIR)) {
-            next unless /(.*)\.(hi|l?hs|l?y)$/;
-            #don't tag it twice or overwrite it with a diff. value
-            next if $IgnoreMe{$1};
-            print STDERR "Module $d will be ignored\n" if $Verbose;
-
-            $IgnoreMe{$1} = 'y';
-        }
-	closedir(DIR); # No, don't check the error code
-    }
-}
-
-sub slurp_file_for_imports {
-    local($file_to_read, $orig_src_file) = @_;
-    local($follow_file,$read_from_file);
-    local($cleanup)=0;
-
-    local(@Old_Syslibs, $options);
-    local(@Old_Ignore_dirs);
-    local($found_options)=0;
-
-    local($last_seen_dir) = $orig_src_file;
-    $last_seen_dir =~ s/\/[^\/]+$//; # strip to dir name
-    $last_seen_dir = '.' if ($last_seen_dir eq $orig_src_file);
-
-    local($mod_name) = $orig_src_file;
-
-    $mod_name =~ s/.*\/([^\/]+)$/$1/g;
-    $mod_name =~ s/^([^.]+)\.(.*)$/$1/;
-
-    print STDERR "Warning: processing module $mod_name, which I was supposed to ignore.\n"
-    	if ( $IgnoreMe{$mod_name} eq 'Y' && $Warnings );
-
-    &process_dependency('import',0,'Prelude') if ($Include_prelude);
-
-    #
-    # Check for {-# OPTIONS in the file-to-be-processed. If any syslib related options
-    # *only* are found, add them to the module search list (and take them off once
-    # we're through with this module.)
-    #
-
-    $options = &check_for_source_options($file_to_read);
-    if ($options ne "") {
-      @Old_Syslibs=@Syslibs;
-      $ProcessingOptions=1;
-      &mangle_command_line_args(split(/\s+/,$options));
-      if (@Old_Syslibs ne @Syslibs) {
-        $found_options=1;
-	@Old_Ignore_dirs = @Ignore_dirs;
-        &gather_import_dirs();
-	&preprocess_import_dirs();
-      }
-    }
-    
-    # we mangle #include's so they will also leave something
-    # behind to indicate the dependency on _them_
-    
-    local ($open_cmd);
-    if ($Cpp_flag_set) {
-       &run_something("${SED} -e '/^# *include/{p;s/^# *include/!include/;}' $file_to_read | $Cpp $Include_dirs -I$last_seen_dir @Defines - 2>&1 > ${file_to_read}.i", $orig_src_file, 'cpp');
-       $read_from_file="${file_to_read}.i";
-       $cleanup=1;
-    } else {
-       $read_from_file="${file_to_read}";
-       $open_cmd = $file_to_read;
-    }
-    print STDERR "$open_cmd\n" if $Verbose;
-
-    open(SRCFILE, $read_from_file) || die "$Pgm: Can't open $file_to_read: $!\n";
-
-    while (<SRCFILE>) {
-        #
-        # import {-# SOURCE #-} Foo (bar) generates dependencies on the source file only,
-        # the compiler will deal with the absence of Foo.hi by consulting the
-        # source for Foo directly. (for dealing with recursive modules).
-        #
-	next unless (/^>?\s*(import)(\s+{-#\s*SOURCE\s*#-})?(\s+qualified)?\s+([A-Z][A-Za-z0-9_']*)/ || /^!(include)(\s+)"(\S+)"/);
-	$todo    = $1;
-        $source  = ( $2 ne '') ? 1 : 0;
-	$modname = $4;
-
-        next if $modname eq '';
-	&process_dependency($todo,$source,$modname);
-    }
-
-    if ($found_options) {
-      @Ignore_dirs = @Old_Ignore_dirs;
-    }
-
-    close(SRCFILE) || exit(1);
-    # remove temporary file, if any.
-    if ($cleanup) {
-	   unlink("$read_from_file");
-    }
-}
-
-#
-# Handle
-sub process_dependency {
-  local($todo,$source,$modname) = @_;
-
-  if ($todo eq 'import') {
-    if ( $IgnoreMe{$modname} eq 'Y' ) {
-         # user specifically asked for this module
-	 # to be ignored.
-	 $follow_file = '__ignore__';
-    } elsif ( $ModuleIn{$modname} ) {
-        $follow_file = "$ModuleIn{$modname}/$modname.hi";
-    } else { # hard way
-	$follow_file =
-	  &find_in_Import_dirs($orig_src_file, $modname, $last_seen_dir, $source );
-    }
-  } else {
-	$follow_file
-	  = &find_in_Include_dirs($orig_src_file, $modname, $last_seen_dir);
-  }
-
-  if (! $follow_file) { # it didnae find anything
-      die "$orig_src_file: Couldn't handle: $_\n";
-
-  } else { # it found something
-    if ($follow_file ne '__ignore__') {
-	local($int_file) = $follow_file;
-
-	if ( $int_file !~ /\.(l?hs|hi|l?y)$/ ) {
-	    local($str) = "";
-	    foreach $obj  (@Obj_suffix) {
-		$str .= "$bf.$obj ";
-		foreach $suff (@File_suffix) {
-		   $str .= "$bf.${suff}_$obj ";
-	        }
-	    }
-            push(@Depend_lines, "$str: $int_file\n");
-	} else {
-	    $int_file =~ s/\.l?hs$//;
-	    $int_file =~ s/\.l?y$//;
-	    $int_file =~ s/\.hi$//;
-            local($source_dep);
-
-            if ( $source ) {
-		# if a version specific .hi-boot file exist, use it.
-		if ( -f "$int_file.hi-boot-${HiBootVersion}" ) {
-               	   $source_dep = "$int_file.hi-boot-${HiBootVersion}";
-		} else {
-		   $source_dep = "$int_file.hi-boot";
-		}
-            } else {
-	        local($str)="";
-		foreach $obj (@Obj_suffix) {
-	           $str .= "$bf.$obj ";
-                }
-	        push(@Depend_lines, "$str: $int_file.hi\n");
-            }
-
-            if ( ! $source ) {
-	       foreach $suff  (@File_suffix) {
-	          local($str) = "";
-		  foreach $obj (@Obj_suffix) {
-		    $str .= "$bf.${suff}_$obj ";
-		  }
-		  push(@Depend_lines, "$str: $int_file.${suff}_hi\n");
-	       }
-            } else {
-	       local($str) = "";
-	       foreach $obj  (@Obj_suffix) {
-		   $str .= "$bf.$obj ";
-		   foreach $suff (@File_suffix) {
-		     $str .= "$bf.${suff}_$obj ";
-	           }
-	       }
-	       push(@Depend_lines, "$str: $source_dep\n");
-            }
-	}
-     }
-   }
-}
-
-# when we see something, we cache that fact ('y').
-# also, when we get a miss, we cache that (so we don't try later); ('n')
-%FileExists = ();
-
-sub find_in_Import_dirs {
-    local($orig_src_file, $modname, $last_seen_dir, $source) = @_;
-    local($import_dir);
-    local($do_magical_check) = 0;
-    local($name_to_check);
-
-    # do it the old hard way: hop along Import_dir list
-    foreach $import_dir (@Import_dirs) {
-	# handle . magically
-	if ($import_dir eq '.') {
-	    # record that we should do a SPECIAL try for a file in last_seen_dir (LAST)
-	    $do_magical_check = 1;
-	}
-
-	$name_to_check = "$import_dir/$modname.hi";
-	if ( $FileExists{$name_to_check} ne 'n' ) { # either 'y' or nothing
-	    print STDERR "trying $name_to_check...\n" if $Verbose >= 2; # very verbose
-	    return($name_to_check) if $FileExists{$name_to_check} eq 'y';
-	    if (-f $name_to_check) {
-		$FileExists{$name_to_check} = 'y';
-		return($name_to_check) ;
-	    } else {
-		$FileExists{$name_to_check} = 'n';
-	    }
-    	}
-
-	for $suff ('hs', 'lhs', 'ly', 'y') {
-	    $name_to_check = "$import_dir/$modname.$suff";
-	    print STDERR "trying... $name_to_check\n" if $Verbose >= 2; # very verbose
-	    return($name_to_check) if -f $name_to_check;
-        }
-
-	if ( $source ) {
-	    $name_to_check = "$import_dir/$modname.hi-boot-${HiBootVersion}";
-	    print STDERR "trying... $name_to_check\n" if $Verbose >= 2; # very verbose
-	    return($name_to_check) if -f $name_to_check;
-
-	    $name_to_check = "$import_dir/$modname.hi-boot";
-	    print STDERR "trying... $name_to_check\n" if $Verbose >= 2; # very verbose
-	    return($name_to_check) if -f $name_to_check;
-	}		
-    }
-    if ($do_magical_check == 1) {
-	$name_to_check = "$last_seen_dir/$modname.hi";
-
-	if ( $FileExists{$name_to_check} ne 'n' ) { # either 'y' or nothing
-	    print STDERR "trying $name_to_check...\n" if $Verbose >= 2; # very verbose
-	    return($name_to_check) if $FileExists{$name_to_check} eq 'y';
-	    if (-f $name_to_check) {
-		$FileExists{$name_to_check} = 'y';
-		return($name_to_check) ;
-	    } else {
-		$FileExists{$name_to_check} = 'n';
-	    }
-    	}
-
-	for $suff ('lhs', 'hs', 'ly', 'y') {
-	    $name_to_check = "$last_seen_dir/$modname.$suff";
-	    print STDERR "trying... $name_to_check\n" if $Verbose >= 2; # very verbose
-	    return($name_to_check) if -f $name_to_check;
-        }
-    }
-
-    # OK, maybe it's referring to something in a system library
-    #foreach $lib ( @Syslibs ) {
-    #	return('__ignore__') if $LibIfaces{"$lib:$modname"};
-    #}
-
-    # Last hope: referring to a Prelude interface
-    return('__ignore__') if ( $IgnoreMe{$modname} eq 'y' );
-
-    die "No file `$modname.hi', `$modname.lhs', `$modname.hs' (reqd from file `$orig_src_file')\namong import directories:\n\t$Import_dirs\n";
-}
-
-sub find_in_Include_dirs {
-    local($orig_src_file, $name, $last_seen_dir) = @_;
-    local($include_dir);
-    local($do_magical_check) = 0;
-
-    # no funny name guessing here
-
-    # hop along Include_dir list
-    foreach $include_dir (@Include_dirs) {
-	$include_dir =~ s/^-I//;
-
-	# handle . magically
-	if ($include_dir eq '.') {
-	    # record that we should do a SPECIAL try for a file in last_seen_dir (LAST)
-	    $do_magical_check = 1;
-	}
-	print STDERR "trying $include_dir/$name...\n" if $Verbose >= 2; # very verbose
-	if (-f "$include_dir/$name") {
-	    return("$include_dir/$name");
-	}
-    }
-    if ($do_magical_check == 1) {
-	print STDERR "trying $last_seen_dir/$name...\n" if $Verbose >= 2; # very verbose
-	if (-f "$last_seen_dir/$name") {
-	    return("$last_seen_dir/$name");
-	}
-    }
-    die "No file `$name' (reqd from file `$orig_src_file') among include directories: $Include_dirs\n";
-}
-
-# out of the driver, actually
-sub run_something {
-    local($str_to_do, $file_to_read, $tidy_name) = @_;
-
-    print STDERR "\n$tidy_name:\n\t" if $Verbose;
-    print STDERR "$str_to_do\n" if $Verbose;
-
-    local($return_val) = system($str_to_do) >> 8;
-
-    if ($return_val != 0) {
-	local($die_msg) = "$Pgm: Running $tidy_name ( on $file_to_read ) failed";
-        $die_msg .= " program not found: $str_to_do " if $return_val == 255;
-	$die_msg .= " ($!)" if $Verbose && $! != 0;
-	$die_msg .= "\n";
-	print STDERR $die_msg;
-	exit $return_val;
-    }
-}
-
-# out of the driver too.
-sub check_for_source_options {
-    local($file) = @_;
-    local($comment_start,$comment_end);
-
-    # Assume it is a file containing Haskell source
-    $comment_start = "{-#";
-    $comment_end   = "#-}";
-
-    open(FILE,$file) || return ""; # No big loss
-    
-    while (<FILE>) {
-	if ( /^${comment_start} OPTIONS (.*)${comment_end}/ ) {
-           # return the options.
-	   local($stuff) = $1;
-	   print STDERR "Found OPTIONS $stuff in $file\n" if $Verbose;
-	   close(FILE);
-	   return $stuff;
-	}
-        elsif ( /^$/ ) { # ignore empty lines
-           ;
-        }
-        elsif ( /^#line.+$/ ) { # ignore comment lines (unused..ToDo: rm )
-           ;
-        }
-        elsif ( /^{-# LINE.+$/ ) { # ignore line pragmas
-           ;
-        }
-        else { # stop looking, something non-empty / not
-	       # ${comment_start} OPTIONS .. ${comment_end} encountered.
-	    close(FILE);return "";
-        }
-    }
-    close(FILE);
-    return "";
-}
diff --git a/ghc/utils/mkdependHS/prefix.txt b/ghc/utils/mkdependHS/prefix.txt
deleted file mode 100644
index 7e81919766..0000000000
--- a/ghc/utils/mkdependHS/prefix.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a script for generating `make' dependencies for
-# a set of Haskell source files.
-#
-# To configure this script to run on your system, you have
-# to set the following three variables (if they have not already
-# been set above):
-#
-#$libdir='/local/fp/bin/sparc-sun-solaris2/ghc-2.02';
-#$datadir='/local/fp/share/ghc-2.02';
-#