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

Proper Makefiles with proper include and lib directories.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-10-05 10:29:54 +00:00
parent 02320b7db2
commit 0f3d73aeb1
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aviclasses/Makefile.am
View File

@ -1,4 +1,4 @@
DEFAULT_INCLUDES = -I.. -I../src DEFAULT_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I.
noinst_LIBRARIES = libaviclasses.a noinst_LIBRARIES = libaviclasses.a

5
avilib/Makefile.am
View File

@ -1,12 +1,11 @@
# # Process this file with automake to produce Makefile.in. # # Process this file with automake to produce Makefile.in.
AUTOMAKE_OPTIONS = 1.3 foreign AUTOMAKE_OPTIONS = 1.3 foreign
DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
DEFAULT_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I.
noinst_LIBRARIES = libavi.a noinst_LIBRARIES = libavi.a
INCLUDES = -I./
CFLAGS=-O3 -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@ CFLAGS=-O3 -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
libavi_a_SOURCES = avilib.c avidump.c avimisc.c libavi_a_SOURCES = avilib.c avidump.c avimisc.c

18
configure.in
View File

@ -800,17 +800,21 @@ AC_SUBST(WXWINDOWS_LDFLAGS)
AC_SUBST(WXWINDOWS_LIBS) AC_SUBST(WXWINDOWS_LIBS)
AM_CONDITIONAL(HAVE_WXWINDOWS, test x"$have_wxwindows" = "xyes") AM_CONDITIONAL(HAVE_WXWINDOWS, test x"$have_wxwindows" = "xyes")
AVILIB_CFLAGS="-Iavilib -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" AVILIB_CFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
AVILIB_CXXFLAGS="-Iavilib -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" AVILIB_LIBS="-lavi"
AVILIB_LIBS="-Lavilib -lavi"
AVICLASSES_CXXFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
AVICLASSES_LIBS="-laviclasses"
AC_SUBST(AVILIB_CFLAGS) AC_SUBST(AVILIB_CFLAGS)
AC_SUBST(AVILIB_CXXFLAGS)
AC_SUBST(AVILIB_LIBS) AC_SUBST(AVILIB_LIBS)
AC_SUBST(AVICLASSES_CXXFLAGS)
AC_SUBST(AVICLASSES_LIBS)
CFLAGS="-Wall -Wno-sign-compare -Wno-comment -I../src @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@" CFLAGS="-Wall -Wno-sign-compare -Wno-comment @EXTRA_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@"
CXXFLAGS="-Wall -Wno-sign-compare -Wno-comment -I../avilib -I.. @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@ @WXWINDOWS_CFLAGS@ @EXPAT_CFLAGS@ @ZLIB_CFLAGS@ @LZO_CFLAGS@ @BZ2_CFLAGS@" CXXFLAGS="-Wall -Wno-sign-compare -Wno-comment @EXTRA_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @AVICLASSES_CXXFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@ @WXWINDOWS_CFLAGS@ @EXPAT_CFLAGS@ @ZLIB_CFLAGS@ @LZO_CFLAGS@ @BZ2_CFLAGS@"
LDFLAGS=-L../avilib CPPFLAGS="@EXTRA_CFLAGS@"
LDFLAGS="@EXTRA_LDFLAGS@"
AC_OUTPUT(Makefile avilib/Makefile aviclasses/Makefile src/Makefile src/mmg/Makefile doc/Makefile) AC_OUTPUT(Makefile avilib/Makefile aviclasses/Makefile src/Makefile src/mmg/Makefile doc/Makefile)

12
src/Makefile.am
View File

@ -1,9 +1,10 @@
AUTOMAKE_OPTIONS = dist-zip foreign AUTOMAKE_OPTIONS = dist-zip foreign
CFLAGS=@CFLAGS@ @EXTRA_CFLAGS@ DEFAULT_INCLUDES = -I$(top_srcdir) \
CPPFLAGS=@CPPFLAGS@ @EXTRA_CFLAGS@ -I$(top_srcdir)/avilib \
CXXFLAGS=@CXXFLAGS@ @EXTRA_CFLAGS@ -I$(top_srcdir)/aviclasses \
LDFLAGS=@LDFLAGS@ @EXTRA_LDFLAGS@ -I$(top_srcdir)/src
LDFLAGS = -L$(top_srcdir)/avilib -L$(top_srcdir)/aviclasses
if HAVE_WXWINDOWS if HAVE_WXWINDOWS
SUBDIRS = mmg SUBDIRS = mmg
@ -75,7 +76,7 @@ base64tool_SOURCES = base64tool.cpp \
common.cpp common.h \ common.cpp common.h \
mm_io.cpp mm_io.h mm_io.cpp mm_io.h
mkvmerge_LDADD = @AVILIB_LIBS@ @PROFILING_LIBS@ \ mkvmerge_LDADD = @AVILIB_LIBS@ @AVICLASSES_LIBS@ @PROFILING_LIBS@ \
@MATROSKA_LIBS@ @EBML_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ \ @MATROSKA_LIBS@ @EBML_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ \
@ICONV_LIBS@ @MINGW_LIBS@ @EXPAT_LIBS@ @ZLIB_LIBS@ @LZO_LIBS@ \ @ICONV_LIBS@ @MINGW_LIBS@ @EXPAT_LIBS@ @ZLIB_LIBS@ @LZO_LIBS@ \
@BZ2_LIBS@ @BZ2_LIBS@
@ -87,4 +88,3 @@ mkvextract_LDADD = @AVILIB_LIBS@ @PROFILING_LIBS@ @MATROSKA_LIBS@ @EBML_LIBS@ \
@VORBIS_LIBS@ @OGG_LIBS@ @ICONV_LIBS@ @LZO_LIBS@ @BZ2_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @ICONV_LIBS@ @LZO_LIBS@ @BZ2_LIBS@
base64tool_LDADD = @EBML_LIBS@ @ICONV_LIBS@ base64tool_LDADD = @EBML_LIBS@ @ICONV_LIBS@

8
src/mmg/Makefile.am
View File

@ -2,12 +2,8 @@ AUTOMAKE_OPTIONS = dist-zip foreign
bin_PROGRAMS = mmg bin_PROGRAMS = mmg
INCLUDES = -I.. -I../.. DEFAULT_INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/src
CFLAGS=@CFLAGS@ @EXTRA_CFLAGS@
CPPFLAGS=@CPPFLAGS@ @EXTRA_CFLAGS@
CXXFLAGS=@CXXFLAGS@ @EXTRA_CFLAGS@
LDFLAGS=@LDFLAGS@ @EXTRA_LDFLAGS@
mmg_SOURCES = mmg.cpp mmg.h \ mmg_SOURCES = mmg.cpp mmg.h \
../chapters.cpp ../chapters.h \ ../chapters.cpp ../chapters.h \