From 6f8767d6b8e930a2c63d2192efd36e3219efd75d Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 8 Jan 2004 14:08:21 +0000 Subject: [PATCH] Removed libtool again because I couldn't get it to work on cygwin/mingw properly. --- configure.in | 3 +- src/Makefile.am | 96 ++++++++++++++++++++++++++++++++------- src/common/Makefile.am | 35 +++++++++++--- src/common/commonebml.cpp | 2 +- src/mmg/Makefile.am | 17 +++++-- 5 files changed, 122 insertions(+), 31 deletions(-) diff --git a/configure.in b/configure.in index ef426c4e8..a071d96f1 100644 --- a/configure.in +++ b/configure.in @@ -15,8 +15,7 @@ SAVED_CXXFLAGS="$CXXFLAGS" AC_PROG_CXX CXXFLAGS="$SAVED_CXXFLAGS" AC_PROG_MAKE_SET -AC_DISABLE_STATIC -AC_PROG_LIBTOOL +AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(LD, ld, :) diff --git a/src/Makefile.am b/src/Makefile.am index d0cca82d4..f72829506 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,17 +16,82 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \ -Icommon -Iinput -Ioutput LDFLAGS = @LDFLAGS@ $(avilib0_6_10_libdirs) $(aviclasses_libdirs) \ - -Linput -Loutput + -Lcommon -Linput -Loutput SUBDIRS = common input output @MMG_SUBDIRS@ bin_PROGRAMS = mkvmerge mkvinfo mkvextract base64tool -## +### +### mkvmerge +### +#mkvmerge_DEPENDENCIES = common/libmtxcommon.so common/libmtxebmlcommon.so \ +# common/libmtxkaxcommon.la common/libmtxcomp.la \ +# input/libmtxinput.a output/libmtxoutput.a \ +# $(avilib0_6_10_deps) $(aviclasses_deps) +# +#mkvmerge_SOURCES = mkvmerge.cpp \ +# cluster_helper.cpp \ +# pr_generic.cpp +# +#mkvmerge_LDADD = -lmtxinput -lmtxoutput common/libmtxcommon.la \ +# common/libmtxebmlcommon.la common/libmtxkaxcommon.la \ +# common/libmtxcomp.la \ +# @AVILIB_LIBS@ @AVICLASSES_LIBS@ \ +# @MATROSKA_LIBS@ @EBML_LIBS@ \ +# @VORBIS_LIBS@ @FLAC_LIBS@ @OGG_LIBS@ \ +# @ICONV_LIBS@ @MINGW_LIBS@ @EXPAT_LIBS@ \ +# @ZLIB_LIBS@ @LZO_LIBS@ @BZ2_LIBS@ \ +# @PROFILING_LIBS@ +# +# +### +### mkvinfo +### +#mkvinfo_DEPENDENCIES = common/libmtxcommon.la common/libmtxebmlcommon.la \ +# common/libmtxkaxcommon.la +# +#mkvinfo_SOURCES = mkvinfo.cpp \ +# mkvinfo_gui.cpp \ +# mkvinfo_tag_types.cpp +# +#mkvinfo_LDADD = common/libmtxcommon.la common/libmtxebmlcommon.la \ +# @PROFILING_LIBS@ \ +# @MATROSKA_LIBS@ @EBML_LIBS@ @ICONV_LIBS@ \ +# @WXWINDOWS_LIBS@ @MINGW_LIBS@ +# +### +### mkvextract +### +#mkvextract_DEPENDENCIES = common/libmtxcommon.la common/libmtxebmlcommon.la \ +# common/libmtxkaxcommon.la $(avilib0_6_10_deps) +# +#mkvextract_SOURCES = mkvextract.cpp \ +# mkvextract_attachments.cpp \ +# mkvextract_chapters.cpp \ +# mkvextract_tags.cpp \ +# mkvextract_tracks.cpp +# +#mkvextract_LDADD = common/libmtxcommon.la common/libmtxebmlcommon.la \ +# common/libmtxkaxcommon.la @EXPAT_LIBS@ \ +# @PROFILING_LIBS@ @AVILIB_LIBS@ @MATROSKA_LIBS@ @EBML_LIBS@ \ +# @VORBIS_LIBS@ @OGG_LIBS@ @ICONV_LIBS@ @LZO_LIBS@ @BZ2_LIBS@ +# +### +### base64tool +### +#base64tool_DEPENDENCIES = common/libmtxcommon.so common/libmtxebmlcommon.so +# +#base64tool_SOURCES = base64tool.cpp +# +#base64tool_LDADD = common/libmtxcommon.so common/libmtxebmlcommon.so \ +# @EBML_LIBS@ @ICONV_LIBS@ + +### ## mkvmerge ## -mkvmerge_DEPENDENCIES = common/libmtxcommon.la common/libmtxebmlcommon.la \ - common/libmtxkaxcommon.la common/libmtxcomp.la \ +mkvmerge_DEPENDENCIES = common/libmtxkaxcommon.a common/libmtxebmlcommon.a \ + common/libmtxcomp.a common/libmtxcommon.a \ input/libmtxinput.a output/libmtxoutput.a \ $(avilib0_6_10_deps) $(aviclasses_deps) @@ -34,9 +99,8 @@ mkvmerge_SOURCES = mkvmerge.cpp \ cluster_helper.cpp \ pr_generic.cpp -mkvmerge_LDADD = -lmtxinput -lmtxoutput common/libmtxcommon.la \ - common/libmtxebmlcommon.la common/libmtxkaxcommon.la \ - common/libmtxcomp.la \ +mkvmerge_LDADD = -lmtxinput -lmtxoutput -lmtxkaxcommon \ + -lmtxebmlcommon -lmtxcomp -lmtxcommon \ @AVILIB_LIBS@ @AVICLASSES_LIBS@ \ @MATROSKA_LIBS@ @EBML_LIBS@ \ @VORBIS_LIBS@ @FLAC_LIBS@ @OGG_LIBS@ \ @@ -48,14 +112,14 @@ mkvmerge_LDADD = -lmtxinput -lmtxoutput common/libmtxcommon.la \ ## ## mkvinfo ## -mkvinfo_DEPENDENCIES = common/libmtxcommon.la common/libmtxebmlcommon.la \ - common/libmtxkaxcommon.la +mkvinfo_DEPENDENCIES = common/libmtxcommon.a common/libmtxebmlcommon.a \ + common/libmtxkaxcommon.a mkvinfo_SOURCES = mkvinfo.cpp \ mkvinfo_gui.cpp \ mkvinfo_tag_types.cpp -mkvinfo_LDADD = common/libmtxcommon.la common/libmtxebmlcommon.la \ +mkvinfo_LDADD = -lmtxcommon -lmtxebmlcommon \ @PROFILING_LIBS@ \ @MATROSKA_LIBS@ @EBML_LIBS@ @ICONV_LIBS@ \ @WXWINDOWS_LIBS@ @MINGW_LIBS@ @@ -63,8 +127,8 @@ mkvinfo_LDADD = common/libmtxcommon.la common/libmtxebmlcommon.la \ ## ## mkvextract ## -mkvextract_DEPENDENCIES = common/libmtxcommon.la common/libmtxebmlcommon.la \ - common/libmtxkaxcommon.la $(avilib0_6_10_deps) +mkvextract_DEPENDENCIES = common/libmtxcommon.a common/libmtxebmlcommon.a \ + common/libmtxkaxcommon.a $(avilib0_6_10_deps) mkvextract_SOURCES = mkvextract.cpp \ mkvextract_attachments.cpp \ @@ -72,17 +136,15 @@ mkvextract_SOURCES = mkvextract.cpp \ mkvextract_tags.cpp \ mkvextract_tracks.cpp -mkvextract_LDADD = common/libmtxcommon.la common/libmtxebmlcommon.la \ - common/libmtxkaxcommon.la @EXPAT_LIBS@ \ +mkvextract_LDADD = -lmtxkaxcommon -lmtxebmlcommon -lmtxcommon \ @PROFILING_LIBS@ @AVILIB_LIBS@ @MATROSKA_LIBS@ @EBML_LIBS@ \ @VORBIS_LIBS@ @OGG_LIBS@ @ICONV_LIBS@ @LZO_LIBS@ @BZ2_LIBS@ ## ## base64tool ## -base64tool_DEPENDENCIES = common/libmtxcommon.la common/libmtxebmlcommon.la +base64tool_DEPENDENCIES = common/libmtxcommon.a common/libmtxebmlcommon.a base64tool_SOURCES = base64tool.cpp -base64tool_LDADD = common/libmtxcommon.la common/libmtxebmlcommon.la \ - @EBML_LIBS@ @ICONV_LIBS@ +base64tool_LDADD = -lmtxebmlcommon -lmtxcommon @EBML_LIBS@ @ICONV_LIBS@ diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 917fae767..a425edd4c 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -10,10 +10,33 @@ endif INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \ $(avilib0_6_10_incdirs) $(aviclasses_incdirs) -I. -lib_LTLIBRARIES = libmtxcommon.la libmtxebmlcommon.la libmtxkaxcommon.la \ - libmtxcomp.la +#lib_LTLIBRARIES = libmtxcommon.la libmtxebmlcommon.la libmtxkaxcommon.la \ +# libmtxcomp.la -libmtxcommon_la_SOURCES = base64.cpp \ +#libmtxcommon_la_SOURCES = base64.cpp \ +# aac_common.cpp \ +# ac3_common.cpp \ +# common.cpp \ +# dts_common.cpp \ +# iso639.cpp \ +# mp3_common.cpp +# +#libmtxebmlcommon_la_SOURCES = commonebml.cpp \ +# mm_io.cpp +# +#libmtxkaxcommon_la_SOURCES = chapters.cpp \ +# chapter_parser_xml.cpp \ +# chapter_writer.cpp \ +# tagparser_start.cpp \ +# tagparser_end.cpp \ +# tagwriter.cpp +# +#libmtxcomp_la_SOURCES = compression.cpp +# +noinst_LIBRARIES = libmtxcommon.a libmtxebmlcommon.a libmtxkaxcommon.a \ + libmtxcomp.a + +libmtxcommon_a_SOURCES = base64.cpp \ aac_common.cpp \ ac3_common.cpp \ common.cpp \ @@ -21,14 +44,14 @@ libmtxcommon_la_SOURCES = base64.cpp \ iso639.cpp \ mp3_common.cpp -libmtxebmlcommon_la_SOURCES = commonebml.cpp \ +libmtxebmlcommon_a_SOURCES = commonebml.cpp \ mm_io.cpp -libmtxkaxcommon_la_SOURCES = chapters.cpp \ +libmtxkaxcommon_a_SOURCES = chapters.cpp \ chapter_parser_xml.cpp \ chapter_writer.cpp \ tagparser_start.cpp \ tagparser_end.cpp \ tagwriter.cpp -libmtxcomp_la_SOURCES = compression.cpp +libmtxcomp_a_SOURCES = compression.cpp diff --git a/src/common/commonebml.cpp b/src/common/commonebml.cpp index 962a05703..3ca859a14 100644 --- a/src/common/commonebml.cpp +++ b/src/common/commonebml.cpp @@ -24,7 +24,7 @@ using namespace libebml; #if defined(DEBUG) -void __debug_debug_dump_elements(EbmlElement *e, int level) { +void __debug_dump_elements(EbmlElement *e, int level) { int i; EbmlMaster *m; diff --git a/src/mmg/Makefile.am b/src/mmg/Makefile.am index 240895065..8e8062de8 100644 --- a/src/mmg/Makefile.am +++ b/src/mmg/Makefile.am @@ -5,8 +5,12 @@ bin_PROGRAMS = mmg INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common -mmg_DEPENDENCIES = ../common/libmtxcommon.la ../common/libmtxebmlcommon.la \ - ../common/libmtxkaxcommon.la +LDFLAGS = @LDFLAGS@ -L$(top_srcdir)/src/common + +#mmg_DEPENDENCIES = ../common/libmtxcommon.la ../common/libmtxebmlcommon.la \ +# ../common/libmtxkaxcommon.la +mmg_DEPENDENCIES = ../common/libmtxcommon.a ../common/libmtxebmlcommon.a \ + ../common/libmtxkaxcommon.a mmg_SOURCES = mmg.cpp \ extern_data.cpp \ @@ -19,7 +23,10 @@ mmg_SOURCES = mmg.cpp \ tab_global.cpp \ tab_settings.cpp -mmg_LDADD = ../common/libmtxcommon.la ../common/libmtxebmlcommon.la \ - ../common/libmtxkaxcommon.la @MATROSKA_LIBS@ @EBML_LIBS@ \ - @WXWINDOWS_LIBS@ @EXPAT_LIBS@ \ +#mmg_LDADD = ../common/libmtxcommon.la ../common/libmtxebmlcommon.la \ +# ../common/libmtxkaxcommon.la @MATROSKA_LIBS@ @EBML_LIBS@ \ +# @WXWINDOWS_LIBS@ @EXPAT_LIBS@ \ +# @MINGW_GUIAPP@ @MINGW_LIBS@ @ICONV_LIBS@ @PROFILING_LIBS@ +mmg_LDADD = -lmtxkaxcommon -lmtxebmlcommon -lmtxcommon \ + @MATROSKA_LIBS@ @EBML_LIBS@ @WXWINDOWS_LIBS@ @EXPAT_LIBS@ \ @MINGW_GUIAPP@ @MINGW_LIBS@ @ICONV_LIBS@ @PROFILING_LIBS@