Index: configure
===================================================================
--- configure	(revision 287)
+++ configure	(working copy)
@@ -33,7 +33,7 @@
 vis="no"
 
 CC="gcc"
-CFLAGS="-Wall -I. -O4 -ffast-math -D__X264__"
+CFLAGS="-I. -D__X264__"
 LDFLAGS=""
 HAVE_GETOPT_LONG=1
 
@@ -202,14 +202,15 @@
 done
 
 VFWFLAGS=
-if [ "$debug" != "yes" ]; then
-    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
-    LDFLAGS="$LDFLAGS -s"
-    VFW_LDFLAGS="$VFW_LDFLAGS -s"
-fi
+#if [ "$debug" != "yes" ]; then
+#    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
+#    LDFLAGS="$LDFLAGS -s"
+#    VFW_LDFLAGS="$VFW_LDFLAGS -s"
+#fi
 
 rm -f config.mak
 cat > config.mak << EOF
+include ../config.mak
 prefix=$prefix
 eprefix=$eprefix
 bindir=$bindir
@@ -218,7 +219,7 @@
 ARCH=$ARCH
 SYS=$SYS
 CC=$CC
-CFLAGS=$CFLAGS
+CFLAGS=\$(OPTFLAGS) $CFLAGS
 LDFLAGS=$LDFLAGS
 AS=$AS
 ASFLAGS=$ASFLAGS
@@ -237,14 +238,3 @@
     echo "default: x264vfw.dll" >> config.mak
 fi
 
-echo "Platform:   $ARCH"
-echo "System:     $SYS"
-echo "avis input: $avis_input"
-echo "mp4 output: $mp4_output"
-echo "pthread:    $pthread"
-echo "vfw:        $vfw"
-echo "debug:      $debug"
-echo "visualize:  $vis"
-echo
-echo "You can run 'make' now."
-
Index: version.sh
===================================================================
--- version.sh	(revision 287)
+++ version.sh	(working copy)
@@ -1,8 +1,10 @@
 #!/bin/sh
-VER=`svnversion .`
-if [ "x$VER" != x -a "$VER" != exported ]
-then
-  echo "#define X264_VERSION \" svn-$VER\"" > config.h
-else
-  echo "#define X264_VERSION \"\"" > config.h
-fi
+echo "#include \"../config.h\"" > config.h
+echo "#define X264_VERSION \"\"" >> config.h
+#VER=`svnversion .`
+#if [ "x$VER" != x -a "$VER" != exported ]
+#then
+#  echo "#define X264_VERSION \" svn-$VER\"" >> config.h
+#else
+#  echo "#define X264_VERSION \"\"" >> config.h
+#fi
Index: Makefile
===================================================================
--- Makefile	(revision 287)
+++ Makefile	(working copy)
@@ -84,12 +84,14 @@
 include .depend
 endif
 
+dep: depend
+
 clean:
 	rm -f $(OBJS) $(OBJASM) config.h *.a x264.o matroska.o x264 x264.exe .depend TAGS
 	rm -rf vfw/build/cygwin/bin
 
 distclean: clean
-	rm -f config.mak vfw/build/cygwin/config.mak
+#	rm -f config.mak vfw/build/cygwin/config.mak
 
 install: x264
 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)