[m-rev.] trivial dif: delete files resurrected by conversion to git
Julien Fischer
jfischer at opturion.com
Mon Jun 16 13:46:37 AEST 2014
Delete files resurrected by the conversion to git.
scripts/ml.sh:
scripts/mmake.sh:
As above.
Julien.
diff --git a/scripts/ml.sh b/scripts/ml.sh
deleted file mode 100644
index c71dd3f..0000000
--- a/scripts/ml.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#---------------------------------------------------------------------------#
-# Copyright (C) 1995 University of Melbourne.
-# This file may only be copied under the terms of the GNU General
-# Public License - see the file COPYING in the Mercury distribution.
-#---------------------------------------------------------------------------#
-#
-# ML - Mercury Linker.
-#
-# Invokes GCC with the appropriate options to link in the Mercury library.
-#
-# Usage: ml [<ml options>] [<gcc options] files...
-# Options:
-# -v, --verbose
-# Echo gcc command line before executing it
-# -s <grade>
-# Specify which grade of the Mercury library to link with.
-# Defaults to `asm_fast.gc'.
-#
-# Environment variables: MERCURY_C_LIB_DIR
-
-LIBDIR=${MERCURY_C_LIB_DIR=@LIBDIR@/lib}
-verbose=false
-GRADE=asm_fast.gc
-
-while true; do
- case "$1" in
- -v|--verbose)
- verbose=true
- shift ;;
- -s)
- shift
- GRADE="$1"
- shift ;;
- --)
- shift
- break ;;
- -static)
- break ;;
- -s*)
- GRADE="` expr $1 : '-s\(.*\)' `"
- shift ;;
- *)
- break ;;
- esac
-done
-
-case "$GRADE" in
- *.gc)
- LIBGC="-lgc"
- ;;
- *)
- LIBGC=
- ;;
-esac
-
-case @FULLARCH@ in
- *-solaris*)
- LIBDIR_OPTS="
- -R at LIBDIR@/lib/@FULLARCH@ -L$LIBDIR/@FULLARCH@
- -R at LIBDIR@/lib/$GRADE/@FULLARCH@ -L$LIBDIR/$GRADE/@FULLARCH@
- "
- ;;
- *-sgi-irix5*)
- LIBDIR_OPTS="
- -Wl,-rpath, at LIBDIR@/lib/@FULLARCH@:@LIBDIR@/lib/$GRADE/@FULLARCH@
- -L$LIBDIR/@FULLARCH@ -L$LIBDIR/$GRADE/@FULLARCH@
- "
- ;;
- *)
- LIBDIR_OPTS="
- -L$LIBDIR/@FULLARCH@
- -L$LIBDIR/$GRADE/@FULLARCH@
- "
- ;;
-esac
-
-case "`hostname`" in
- cadillac.dd.citri.edu.au)
- GCC=/usr/local/bin/gcc ;;
- kryten.cs.mu.OZ.AU)
- GCC=/usr/local/bin/gcc ;;
- *)
- GCC=${GCC=gcc}
-esac
-
-if $verbose; then
- echo $GCC "$@" $LIBDIR_OPTS -lmer -lmercury -lmer $LIBGC
-fi
-exec $GCC "$@" $LIBDIR_OPTS -lmer -lmercury -lmer $LIBGC
diff --git a/scripts/mmake.sh b/scripts/mmake.sh
deleted file mode 100644
index 556fa98..0000000
--- a/scripts/mmake.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-#---------------------------------------------------------------------------#
-# Copyright (C) 1995 University of Melbourne.
-# This file may only be copied under the terms of the GNU General
-# Public License - see the file COPYING in the Mercury distribution.
-#---------------------------------------------------------------------------#
-#
-# mmake - Mercury Make.
-#
-# Type mmake -h for help.
-#
-#-----------------------------------------------------------------------------#
-
-MAKE=${MMAKE_MAKE=make}
-MMAKE_VARS=${MMAKE_VARS=@LIBDIR@/mmake/Mmake.vars}
-MMAKE_RULES=${MMAKE_RULES=@LIBDIR@/mmake/Mmake.rules}
-MERCURY_INT_DIR=${MERCURY_INT_DIR=@LIBDIR@/ints}
-
-MMAKE=$0
-verbose=false
-save_makefile=false
-
-while [ $# -gt 0 ]; do
- case $1 in
- -h|--help)
-#-----------------------------------------------------------------------------#
- cat << 'EOF'
-Usage: mmake [<mmake options>] [-- <make options>] <target>...
-Options:
- -s, --save-makefile:
- Save the generated makefile to `Mmake.makefile'.
- -v, --verbose:
- Print verbose progress messages.
- -h, --help:
- Print this usage message.
-Targets:
- <module>.depend:
- Make the file `<module>.dep'. This step is required
- in preparation for the targets below.
- <module>:
- Compile and link a Mercury program with main module
- `<module>.nl' to produce an executable.
- <module>.nu:
- Compile and link a Mercury program with NU-Prolog
- rather than with the Mercury compiler.
- clean:
- Remove intermediate files.
- realclean:
- Remove all automatically-generated files: intermediate files,
- dependency files, and executables.
-EOF
-#-----------------------------------------------------------------------------#
- exit
- ;;
- -s|--save-makefile)
- save_makefile=true
- MMAKE="$MMAKE $1"
- shift
- ;;
- -v|--verbose)
- verbose=true
- MMAKE="$MMAKE $1"
- shift
- ;;
- --)
- MMAKE="$MMAKE $1"
- shift
- break
- ;;
- *)
- break
- ;;
- esac
-done
-
-if [ -f Mmake ]; then
- mmake="Mmake"
-else
- mmake=""
-fi
-if [ "`echo *.dep`" = "*.dep" ]; then
- deps=""
-else
- deps="*.dep"
-fi
-if [ "`echo *.d`" = "*.d" ]; then
- ds=""
-else
- ds="*.d"
-fi
-
-if $save_makefile; then
- tmp=Mmake.makefile
-else
- tmp=/tmp/mmake.$$
- trap 'status=$?; rm -f $tmp; exit $status' 0 1 2 3 13 15
-fi
-
-if $verbose; then
- echo MMAKE=$MMAKE
- echo export MMAKE
- echo MERCURY_INT_DIR=$MERCURY_INT_DIR
- echo export MERCURY_INT_DIR
- echo cat ${MMAKE_VARS} $deps $ds $mmake ${MMAKE_RULES} ">" $tmp
- echo ${MAKE} -f $tmp "$@"
-fi
-export MMAKE
-export MERCURY_INT_DIR
-cat ${MMAKE_VARS} $deps $ds $mmake ${MMAKE_RULES} > $tmp
-${MAKE} -f $tmp -r "$@"
More information about the reviews
mailing list