X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;h=3fa1d7351c42d26488d6222920fc0b6427725c18;hp=cb9fc4a90996fdea476b74551813050cfb98a2a6;hb=2b85475321db7b38d4df0869fb51d38d98bb6671;hpb=31514b441ce29f78c114e9d912ba09f37f91d257

diff --git a/Remakefile.in b/Remakefile.in
index cb9fc4a..3fa1d73 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -72,102 +72,24 @@ distclean: clean test_clean
 	fi
 
 %.cmx %.dep:
-	REMAKE="$(REMAKE) -v OCAMLNATIVE=-native"
 	base=$*
-	dirname=${base%/*}
-	if test -f "$dirname".pack; then
-		#we are below a pack directory
-		PACKDIR=`basename $dirname`
-		PACKINCLUDE="-I $dirname"
-	elif test -f $*.pack -a -d $*; then
-		$(REMAKE) $*.pack
-		PACKINCLUDE="-I $*"
-		PACKDIR=`basename $*`
-		DOPACK=1
-	fi
-	if test "$PACKDIR"; then
-		PACKNAME=`echo $PACKDIR | cut -b1 | tr a-z A-Z`${PACKDIR#?}
-		FORPACK="-for-pack $PACKNAME"
-	fi
-
-	if test "$DOPACK"; then
-		modules=`cat $*.pack`
-		objects=`echo $modules | xargs tools/ocamlmoduledep.sh -native $PACKINCLUDE -I $(SRC) `
-	else
-	   	$REMAKE $*.ml
-	   	modules=`$(OCAMLDEP) $(OCAMLFINDFLAGS) -modules $*.ml | cut -f 2- -d ':'`
-	 	objects=`tools/ocamlmoduledep.sh -native $PACKINCLUDE -I $(SRC) $modules`
-	fi
-
-	$REMAKE $objects
-
-	deps=`echo $objects | sed 's/[.]cm[ix]/.dep/g'`
-	rm -f $*.dep; touch $*.dep
-	$(REMAKE) $deps
-	for f in $deps; do
-	  for g in `cat $f`; do
-	      if grep -q $g $*.dep; then continue; fi
-	      echo $g >> $*.dep
-	   done
-	   if grep -q $f $*.dep; then continue; fi
-	   echo $f >> $*.dep
-	done
-	if test -f $*.mli; then $REMAKE -v PACKINCLUDE="$PACKINCLUDE" $*.cmi; fi
-	if test "$DOPACK"; then
-		sorted_objects=`cat $*.dep | grep "$PACKDIR" | sed 's/[.]dep/.cmx/' | xargs`
-		cat $*.dep | grep -v "$PACKDIR" > $*.tmp
-		mv $*.tmp $*.dep
-		$(OCAMLOPT) -o $@ -pack $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $sorted_objects
-	else
-		$(OCAMLOPT) -o $@ $FORPACK -c $PACKINCLUDE $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $*.ml
-	fi
+	target=$@
+	NATIVE=-native
+	REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	SRC=$(SRC)
+	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+	. tools/ocamldriver.sh
 
 %.cmo %.dep:
-	REMAKE="$(REMAKE)"
 	base=$*
-	dirname=${base%/*}
-	if test -f "$dirname".pack; then
-		#we are below a pack directory
-		PACKDIR=`basename $dirname`
-		PACKINCLUDE="-I $dirname"
-	elif test -f $*.pack -a -d $*; then
-		PACKINCLUDE="-I $*"
-		PACKDIR=`basename $*`
-		DOPACK=1
-	fi
-
-	if test "$DOPACK"; then
-		modules=`cat $*.pack`
-		objects=`echo $modules | xargs tools/ocamlmoduledep.sh $PACKINCLUDE -I $(SRC) `
-		$REMAKE $objects
-	else
-	   	$REMAKE $*.ml
-	   	modules=`$(OCAMLDEP) $(OCAMLFINDFLAGS) -modules $*.ml | cut -f 2- -d ':'`
-	 	objects=`tools/ocamlmoduledep.sh $PACKINCLUDE -I $(SRC) $modules`
-		$REMAKE $objects
-	fi
-
-	deps=`echo $objects | sed 's/[.]cm[io]/.dep/g'`
-	rm -f $*.dep; touch $*.dep
-	$(REMAKE) $deps
-	for f in $deps; do
-	   for g in `cat $f`; do
-	      if grep -q $g $*.dep; then continue; fi
-	      echo $g >> $*.dep
-	   done
-	   if grep -q $f $*.dep; then continue; fi
-	   echo $f >> $*.dep
-	done
-
-	if test -f $*.mli; then $REMAKE -v PACKINCLUDE="$PACKINCLUDE" $*.cmi; fi
-	if test "$DOPACK"; then
-		sorted_objects=`cat $*.dep | grep "$PACKDIR" | sed 's/[.]dep/.cmo/' | xargs`
-		cat $*.dep | grep -v "$PACKDIR" > $*.tmp
-		mv $*.tmp $*.dep
-		$(OCAMLC) -o $@ -pack $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $sorted_objects
-	else
-		$(OCAMLC) -o $@ -c $PACKINCLUDE $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)  $*.ml
-	fi
+	target=$@
+	NATIVE=
+	REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	SRC=$(SRC)
+	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
+	. tools/ocamldriver.sh
 
 %.cmi:
 	$(REMAKE) $*.mli