Migrate to new remake.
[tatoo.git] / Remakefile.in
index 3f16f26..e38e3b9 100644 (file)
@@ -5,14 +5,23 @@ OCAMLFINDINCLUDES = $(addprefix "-I ", src)
 OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES)  \
        $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
 OCAMLFINDLINKFLAGS = -linkpkg
-ODEP=tools/odeps.sh @OCAMLDEP@
-PACKAGE=@PACKAGE_TARNAME@
-BIN=src/@PACKAGE_TARNAME@.native@EXE@
-EXE=@EXE@
+PACKAGE = @PACKAGE_TARNAME@
+BIN = src/@PACKAGE_TARNAME@.native@EXE@
+EXE = @EXE@
+
+REMAKE = @REMAKE@
+OCAMLDEP = @OCAMLDEP@
+ODEPS = tools/odeps.sh $(OCAMLDEP)
+OCAMLC = @OCAMLC@
+OCAMLOPT = @OCAMLOPT@
+OCAMLFLAGS = @OCAMLFLAGS@
+OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
+OCAMLCFLAGS = @OCAMLCFLAGS@
+OCAMLYACC = @OCAMLYACC@
 
 all: $(BIN)
 
-tools: tools/xml_diff.native@EXE@ tools/XPathEval.class
+tools: tools/xml_diff.native$(EXE) tools/XPathEval.class
 
 Remakefile: Remakefile.in config.status
        ./config.status Remakefile
@@ -44,106 +53,106 @@ distclean: clean test_clean
        rm -rf config.status configure config.log autom4te.cache .remake Remakefile remake
 
 %.class: %.java
-       javac ${1%.class}.java
+       javac $<
 
-%.native@EXE@:
-       base=${1%.native}
+%.native$(EXE):
+       base=$*
        src=${base}.ml
        obj=${base}.cmx
-       dir=$(dirname $1)
-       @REMAKE@ -v OCAMLDEPNATIVE=-native "$obj"
-       SRCS=$(ls "$dir"/*.cmx | sed 's/\.cmx/.ml/g')
-       OBJS=$(@OCAMLDEP@ $OCAMLDEPNATIVE $OCAMLFINDFLAGS -modules $SRCS | tools/osort.sh cmx)
-       @OCAMLOPT@ -o "$1"  @OCAMLFLAGS@ @OCAMLOPTFLAGS@ $OCAMLFINDLINKFLAGS $OCAMLFINDFLAGS $OBJS
-
-%.byte@EXE@:
-       base=${1%.byte}
+       dir=`dirname "$@"`
+       $(REMAKE) -v OCAMLDEPNATIVE=-native "$obj"
+       srcs=`ls "$dir"/*.cmx | sed 's/\.cmx/.ml/g'`
+       objs=`$(OCAMLDEP) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) -modules $srcs | tools/osort.sh cmx`
+       $(OCAMLOPT) -o "$@"  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objs
+
+%.byte$(EXE):
+       base=$*
        src=${base}.ml
        obj=${base}.cmo
-       dir=$(dirname $1)
-       @REMAKE@ "$obj"
-       OBJS=""
+       dir=`dirname "$@"`
+       $(REMAKE) "$obj"
+       objs=""
        for i in "$dir"/*.cmi; do
                ibase=${i%.cmi}
                if test -f "${ibase}.ml" -o -d "${ibase}" -o -f "${ibase}.mly" -o -f "${ibase}.mll"; then
-                       OBJS="$OBJS ${ibase}.cmo"
+                       objs="$objs ${ibase}.cmo"
                fi
        done
-       @REMAKE@ $OBJS
-       SRCS=$(ls "$dir"/*.cmo | sed 's/\.cmo/.ml/g')
-       SORTED_OBJS=$(@OCAMLDEP@ $OCAMLFINDFLAGS -modules $SRCS | tools/osort.sh cmo)
-       @OCAMLC@ -o "$1"  @OCAMLFLAGS@ @OCAMLCFLAGS@ $OCAMLFINDLINKFLAGS $OCAMLFINDFLAGS $SORTED_OBJS
+       $(REMAKE) $objs
+       srcs=`ls "$dir"/*.cmo | sed 's/\.cmo/.ml/g'`
+       sorted_objs=`$(OCAMLDEP) $OCAMLFINDFLAGS -modules $srcs | tools/osort.sh cmo`
+       $(OCAMLC) -o "$@"  $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $sorted_objs
 
 %.cmx:
-       target="$1"
+       target="$@"
        base="${target%.cmx}"
        src="${base}.ml"
        if [ -f "$src" ]; then
-               @REMAKE@ "$src"
-               DEPS=$( $ODEP -native $OCAMLFINDFLAGS $PACKINCLUDE "$src" )
-               echo "$DEPS" | @REMAKE@ -v PACKINCLUDE="$PACKINCLUDE" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$OCAMLFORPACK" -r "$target"
-               @OCAMLOPT@ -o "$target" -c @OCAMLFLAGS@ @OCAMLOPTFLAGS@ $OCAMLFORPACK $OCAMLFINDFLAGS $PACKINCLUDE "$src"
+               $(REMAKE) "$src"
+               deps=`$(ODEPS) -native $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"`
+               echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
+               $(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFORPACK) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
        elif [ -d "$base" ];    then
-               modname=$(basename "$base")
-               packname=$(echo "$modname" | sed 's/\(.*\)/\u\1/')
-               OBJS=$(ls "$base"/*.ml | sed 's/\.ml/.cmx/g')
-               @REMAKE@ -v PACKINCLUDE="-I $base" -v OCAMLFORPACK="-for-pack $packname" $OBJS
-               SORTED_OBJS=$(@OCAMLDEP@ -native $OCAMLFINDFLAGS -I $base -modules "$base"/*.ml | tools/osort.sh cmx)
-               @OCAMLOPT@ -o "$target" -pack $SORTED_OBJS
+               modname=`basename "$base"`
+               packname=`echo "$modname" | sed 's/\(.*\)/\u\1/'`
+               objs=`ls "$base"/*.ml | sed 's/\.ml/.cmx/g'`
+               $(REMAKE) -v PACKINCLUDE="-I $base" -v OCAMLFORPACK="-for-pack $packname" $objs
+               sorted_objs=`$(OCAMLDEP) -native $(OCAMLFINDFLAGS) -I $base -modules "$base"/*.ml | tools/osort.sh cmx`
+               $(OCAMLOPT) -o "$target" -pack $sorted_objs
        elif [ -f "$base".mly ]; then
-               @REMAKE@ "$base".mly
-               @OCAMLYACC@ "$base".mly
-                $ODEP $OCAMLDEPNATIVE $OCAMLFINDFLAGS "$src" | \
-                       @REMAKE@ -v PACKINCLUDE="$PACKINCLUDE" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$OCAMLFORPACK" -r "$target"
-               @OCAMLOPT@ -o "$target" -c @OCAMLFLAGS@ @OCAMLOPTFLAGS@ $OCAMLFORPACK $OCAMLFINDFLAGS $PACKINCLUDE "$src"
+               $(REMAKE) "$base".mly
+               $(OCAMLYACC) "$base".mly
+                $(ODEPS) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) "$src" | \
+                       $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
+               $(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFORPACK) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
        fi
 
 
 %.cmo:
-       target="$1"
+       target="$@"
        base="${target%.cmo}"
        src="${base}.ml"
        if [ -f "$src" ]; then
-               @REMAKE@ "$src"
-               DEPS=$( $ODEP $OCAMLFINDFLAGS $PACKINCLUDE "$src" )
-               echo "$DEPS" | @REMAKE@ -v PACKINCLUDE="$PACKINCLUDE" -r "$target"
-               @OCAMLC@ -o "$target" -c @OCAMLFLAGS@ @OCAMLCFLAGS@ $OCAMLFINDFLAGS $PACKINCLUDE "$src"
+               $(REMAKE) "$src"
+               deps=`$(ODEPS) $OCAMLFINDFLAGS $PACKINCLUDE "$src"`
+               echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -r "$target"
+               $(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
        elif [ -d "$base" ];    then
-               modname=$(basename "$base")
-               packname=$(echo "$modname" | sed 's/\(.*\)/\u\1/')
-               OBJS=$(ls "$base"/*.ml | sed 's/\.ml/.cmo/g')
-               @REMAKE@ -v PACKINCLUDE="-I $base" $OBJS
-               SORTED_OBJS=$(@OCAMLDEP@ $OCAMLFINDFLAGS -I $base -modules "$base"/*.ml | tools/osort.sh cmo)
-               @OCAMLC@ -o "$target" -pack $SORTED_OBJS
+               modname=`basename "$base"`
+               packname=`echo "$modname" | sed 's/\(.*\)/\u\1/'`
+               objs=`ls "$base"/*.ml | sed 's/\.ml/.cmo/g'`
+               $(REMAKE) -v PACKINCLUDE="-I $base" $objs
+               sorted_objs=`$(OCAMLDEP) $(OCAMLFINDFLAGS) -I $base -modules "$base"/*.ml | tools/osort.sh cmo`
+               $(OCAMLC) -o "$target" -pack $sorted_objs
        elif [ -f "$base".mly ]; then
-               @REMAKE@ "$base".mly
-               @OCAMLYACC@ "$base".mly
-                $ODEP $OCAMLFINDFLAGS $PACKINCLUDE "$src" | @REMAKE@ -v PACKINCLUDE="$PACKINCLUDE" -r "$target"
-               @OCAMLC@ -o "$target" -c @OCAMLFLAGS@ @OCAMLCFLAGS@ $OCAMLFINDFLAGS $PACKINCLUDE "$src"
+               $(REMAKE) "$base".mly
+               $(OCAMLYACC) "$base".mly
+                $(ODEPS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -r "$target"
+               $(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
        fi
 
 
 
 %.cmi:
-       target="$1"
+       target="$@"
        base=${target%.cmi}
        if test -f "$base".mli; then
-               @REMAKE@ "$base".mli
+               $(REMAKE) "$base".mli
                src=${base}.mli
-               DEPS=$($ODEP $OCAMLDEPNATIVE $OCAMLFINDFLAGS $PACKINCLUDE "$src")
-               echo "$DEPS" | @REMAKE@ -v PACKINCLUDE="$PACKINCLUDE" -v OCAMLDEPNATIVE="$OCAMLDEPNATIVE" -v OCAMLFORPACK="$OCAMLFORPACK" -r "$target"
-               if test -z "$OCAMLDEPNATIVE"; then
-                       @OCAMLC@ -o "$target" -c @OCAMLFLAGS@ @OCAMLCFLAGS@ $OCAMLFINDFLAGS $PACKINCLUDE "$src"
+               deps=`$(ODEPS) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"`
+               echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE="$(OCAMLDEPNATIVE)" -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
+               if test -z "$(OCAMLDEPNATIVE)"; then
+                       $(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
                else
-                       @OCAMLOPT@ -o "$target" -c @OCAMLFLAGS@ @OCAMLOPTFLAGS@ $OCAMLFINDFLAGS $PACKINCLUDE "$src"
+                       $(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
                fi
        else
-               if test -z "$OCAMLDEPNATIVE"; then
+               if test -z "$(OCAMLDEPNATIVE)"; then
                  obj=${base}.cmo
                else
                  obj=${base}.cmx
                fi
-               @REMAKE@ -v PACKINCLUDE="$PACKINCLUDE" -v OCAMLDEPNATIVE="$OCAMLDEPNATIVE" -v OCAMLFORPACK="$OCAMLFORPACK" "$obj"
+               $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE="$(OCAMLDEPNATIVE)" -v OCAMLFORPACK="$(OCAMLFORPACK)" "$obj"
        fi
 
 ## Tests
@@ -151,34 +160,34 @@ distclean: clean test_clean
 test:
        for i in tests/*.xml
        do
-               @REMAKE@ "$i".summary
+               $(REMAKE) "$i".summary
        done
 
 test_clean:
-       rm -rf tests/*.summary tests/*.results/*_"$PACKAGE".*
+       rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)".*
 
 %.summary:
-               base="${1%.xml.summary}"
-               @REMAKE@ "$base".xml "$base".xml.queries tools "$BIN"
-               rm -f "$1"
+               base=`dirname "$@"`/`basename "$@" .xml.summary`
+               $(REMAKE) "$base".xml "$base".xml.queries tools "$(BIN)"
+               rm -f "$@"
                cat "$base".xml.queries | grep -v '^#' | while read q query; do
                        echo -n "$base"".xml $q $query ... "
                        REF="$base".xml.results/"$q"_jaxp.xml
-                       @REMAKE@ "$REF"
-                       OUTPUT="$base".xml.results/"$q"_"$PACKAGE".xml
-                       LOG="$base".xml.results/"$q"_"$PACKAGE".log
+                       $(REMAKE) "$REF"
+                       OUTPUT="$base".xml.results/"$q"_"$(PACKAGE)".xml
+                       LOG="$base".xml.results/"$q"_"$(PACKAGE)".log
                        src/@PACKAGE_TARNAME@.native@EXE@ -s "$base".xml \
                                "$query" "$OUTPUT" > "$LOG" 2>&1
-                       echo "Query: $q : $query" >> "$1"
-                       cat  "$LOG" | grep '^STATS' >> "$1"
-                       echo -n "Diff: " >> "$1"
+                       echo "Query: $q : $query" >> "$@"
+                       cat  "$LOG" | grep '^STATS' >> "$@"
+                       echo -n "Diff: " >> "$@"
                        if tools/xml_diff.native "$REF" "$OUTPUT" >/dev/null 2>&1; then
                                echo ok
-                               echo ok >> "$1"
+                               echo ok >> "$@"
                        else
                                echo failed
-                               echo failed >> "$1"
+                               echo failed >> "$@"
                                exit 1
                        fi
-                       echo '-------------------------------------------' >> "$1"
+                       echo '-------------------------------------------' >> "$@"
                done