Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made Makefiles include Makefile.options instead of Makefile.mingw.options which now is a master file like all the other Makefile.mingw.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-01-10 18:18:44 +00:00
parent c4bfa2bdcf
commit 5c1084f2ef
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.mingw.options
View File

@ -21,10 +21,10 @@ COMPRESSION_LIBS = bzlib lzo
#LDFLAGS = #LDFLAGS =
# Have libebml and libmatroska been compiled as DLLs? # Have libebml and libmatroska been compiled as DLLs?
CXXFLAGS += -DEBML_DLL -DMATROSKA_DLL #CXXFLAGS += -DEBML_DLL -DMATROSKA_DLL
# Build mkvtoolnix with DLLs? # Build mkvtoolnix with DLLs?
MTX_DLLS = yes #MTX_DLLS = yes
# Activate debugging options? # Activate debugging options?
DEBUG = yes DEBUG = yes

43
autogen.sh
View File

@ -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 Detected MinGW. Will copy the Makefile,mingw to Makefile and
echo make some adjustments. echo make some adjustments.
echo '' 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 for i in `find -name Makefile.mingw`; do
n=`echo $i | sed 's/\.mingw//'` n=`echo $i | sed 's/\.mingw//'`
echo "Creating $n from $i" 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 done
echo "Creating Makefile.common from Makefile.mingw.common" echo "Creating Makefile.common from Makefile.mingw.common"
sed -e "s!-f Makefile.mingw!!g" < Makefile.mingw.common > Makefile.common sed -e "s!-f Makefile.mingw!!g" < Makefile.mingw.common > Makefile.common
if test "x$1" = "x"; then 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" echo "Creating config.h from config.h.mingw"
cp config.h.mingw config.h cp config.h.mingw config.h
echo '' 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 config.h.'
echo 'Not creating the dependencies.' echo 'Not creating the dependencies.'
fi 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 $? exit $?
fi fi