From 5c1084f2ef22bb64bd11dbf7624f8dfb3e60cef3 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Sat, 10 Jan 2004 18:18:44 +0000
Subject: [PATCH] Made Makefiles include Makefile.options instead of
 Makefile.mingw.options which now is a master file like all the other
 Makefile.mingw.

---
 Makefile.mingw.options |  4 ++--
 autogen.sh             | 43 ++++++++++++++++++++++++------------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Makefile.mingw.options b/Makefile.mingw.options
index 941165019..83b5cf89f 100644
--- a/Makefile.mingw.options
+++ b/Makefile.mingw.options
@@ -21,10 +21,10 @@ COMPRESSION_LIBS = bzlib lzo
 #LDFLAGS =
 
 # Have libebml and libmatroska been compiled as DLLs?
-CXXFLAGS += -DEBML_DLL -DMATROSKA_DLL
+#CXXFLAGS += -DEBML_DLL -DMATROSKA_DLL
 
 # Build mkvtoolnix with DLLs?
-MTX_DLLS = yes
+#MTX_DLLS = yes
 
 # Activate debugging options?
 DEBUG = yes
diff --git a/autogen.sh b/autogen.sh
index 2b59f24a6..909722c86 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,33 +8,18 @@ if gcc -v 2>&1 | grep -i mingw > /dev/null 2> /dev/null; then
   echo Detected MinGW. Will copy the Makefile,mingw to Makefile and
   echo make some adjustments.
   echo ''
-  if gcc -o ___getcwd contrib/getcwd.c ; then
-    REALCWD=`./___getcwd`
-    echo Automatically patching Makefile.mingw.options with the
-    echo real top dir: $REALCWD
-    if grep ^TOP Makefile.mingw.options > /dev/null 2> /dev/null; then
-      sed "s/^TOP.=/TOP = $REALCWD/" < Makefile.mingw.options > mf-tmp
-    else
-      echo "# TOP dir set automatically by autogen.sh" > mf-tmp
-      echo "TOP = $REALCWD" >> mf-tmp
-    fi
-    mv mf-tmp Makefile.mingw.options
-  else
-    echo Could not compile a test program for getting the
-    echo top level directory. Set it yourself in Makefile.mingw.options
-  fi
-  rm -f ___getcwd.*
-  echo ''
 
   for i in `find -name Makefile.mingw`; do
     n=`echo $i | sed 's/\.mingw//'`
     echo "Creating $n from $i"
-    sed -e "s/Makefile.mingw.common/Makefile.common/g" < $i > $n
+    sed -e "s/Makefile.mingw/Makefile/g" < $i > $n
   done
   echo "Creating Makefile.common from Makefile.mingw.common"
   sed -e "s!-f Makefile.mingw!!g" < Makefile.mingw.common > Makefile.common
 
   if test "x$1" = "x"; then
+    echo "Creating Makefile.options from Makefile.mingw.options"
+    cp Makefile.mingw.options Makefile.options
     echo "Creating config.h from config.h.mingw"
     cp config.h.mingw config.h
     echo ''
@@ -45,6 +30,28 @@ if gcc -v 2>&1 | grep -i mingw > /dev/null 2> /dev/null; then
     echo 'Not creating config.h.'
     echo 'Not creating the dependencies.'
   fi
+  echo ''
+
+  if gcc -o ___getcwd contrib/getcwd.c ; then
+    REALCWD=`./___getcwd`
+    echo Automatically patching Makefile.options with the
+    echo real top dir: $REALCWD
+    if grep ^TOP Makefile.options > /dev/null 2> /dev/null; then
+      sed "s/^TOP.=/TOP = $REALCWD/" < Makefile.options > mf-tmp
+    else
+      echo "# TOP dir set automatically by autogen.sh" > mf-tmp
+      echo "TOP = $REALCWD" >> mf-tmp
+    fi
+    mv mf-tmp Makefile.options
+  else
+    echo Could not compile a test program for getting the
+    echo top level directory. Set it yourself in Makefile.options
+  fi
+  rm -f ___getcwd.*
+  echo ''
+
+  echo 'Done with the preparations. Please review and edit the'
+  echo 'settings in Makefile.options. Then run "make".'
 
   exit $?
 fi