diff --git a/src/Makefile.am b/src/Makefile.am index 08a29a145..b55a75aef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,24 +18,27 @@ DEFAULT_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \ LDFLAGS = @LDFLAGS@ $(avilib0_6_10_libdirs) $(aviclasses_libdirs) -if HAVE_WXWINDOWS -SUBDIRS = mmg -endif +SUBDIRS = . @MMG_SUBDIRS@ + +noinst_LIBRARIES = libmtxcommon.a + +libmtxcommon_a_SOURCES = base64.cpp \ + chapters.cpp chapters.h \ + chapter_parser_xml.cpp \ + compression.cpp compression.h \ + common.cpp common.h \ + iso639.cpp iso639.h \ + mm_io.cpp mm_io.h \ + tagparser_start.cpp tagparser.h \ + tagparser_end.cpp bin_PROGRAMS = mkvmerge mkvinfo mkvextract base64tool mkvmerge_SOURCES = mkvmerge.cpp mkvmerge.h \ aac_common.cpp aac_common.h \ ac3_common.cpp ac3_common.h \ - base64.cpp base64.h \ - chapters.cpp chapters.h \ - chapter_parser_xml.cpp \ - compression.cpp compression.h \ dts_common.cpp dts_common.h \ cluster_helper.cpp cluster_helper.h \ - common.cpp common.h \ - iso639.cpp iso639.h \ - mm_io.cpp mm_io.h \ mp3_common.cpp mp3_common.h \ p_aac.cpp p_aac.h \ p_ac3.cpp p_ac3.h \ @@ -61,9 +64,7 @@ mkvmerge_SOURCES = mkvmerge.cpp mkvmerge.h \ r_ogm.cpp r_ogm.h \ r_vobsub.cpp r_vobsub.h \ r_wav.cpp r_wav.h \ - subtitles.cpp subtitles.h \ - tagparser_start.cpp tagparser.h \ - tagparser_end.cpp + subtitles.cpp subtitles.h mkvinfo_SOURCES = mkvinfo.cpp mkvinfo.h \ common.cpp common.h \ @@ -88,10 +89,12 @@ base64tool_SOURCES = base64tool.cpp \ common.cpp common.h \ mm_io.cpp mm_io.h -mkvmerge_LDADD = @AVILIB_LIBS@ @AVICLASSES_LIBS@ @PROFILING_LIBS@ \ - @MATROSKA_LIBS@ @EBML_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ \ - @ICONV_LIBS@ @MINGW_LIBS@ @EXPAT_LIBS@ @ZLIB_LIBS@ @LZO_LIBS@ \ - @BZ2_LIBS@ +mkvmerge_LDADD = -L. -lmtxcommon @AVILIB_LIBS@ @AVICLASSES_LIBS@ \ + @MATROSKA_LIBS@ @EBML_LIBS@ \ + @VORBIS_LIBS@ @OGG_LIBS@ \ + @ICONV_LIBS@ @MINGW_LIBS@ @EXPAT_LIBS@ \ + @ZLIB_LIBS@ @LZO_LIBS@ @BZ2_LIBS@ \ + @PROFILING_LIBS@ mkvinfo_LDADD = @PROFILING_LIBS@ @MATROSKA_LIBS@ @EBML_LIBS@ @ICONV_LIBS@ \ @WXWINDOWS_LIBS@ @MINGW_LIBS@ diff --git a/src/aac_common.cpp b/src/common/aac_common.cpp similarity index 100% rename from src/aac_common.cpp rename to src/common/aac_common.cpp diff --git a/src/aac_common.h b/src/common/aac_common.h similarity index 100% rename from src/aac_common.h rename to src/common/aac_common.h diff --git a/src/ac3_common.cpp b/src/common/ac3_common.cpp similarity index 100% rename from src/ac3_common.cpp rename to src/common/ac3_common.cpp diff --git a/src/ac3_common.h b/src/common/ac3_common.h similarity index 100% rename from src/ac3_common.h rename to src/common/ac3_common.h diff --git a/src/base64.cpp b/src/common/base64.cpp similarity index 100% rename from src/base64.cpp rename to src/common/base64.cpp diff --git a/src/base64.h b/src/common/base64.h similarity index 100% rename from src/base64.h rename to src/common/base64.h diff --git a/src/byte_buffer.h b/src/common/byte_buffer.h similarity index 100% rename from src/byte_buffer.h rename to src/common/byte_buffer.h diff --git a/src/chapter_parser_xml.cpp b/src/common/chapter_parser_xml.cpp similarity index 100% rename from src/chapter_parser_xml.cpp rename to src/common/chapter_parser_xml.cpp diff --git a/src/chapter_writer.cpp b/src/common/chapter_writer.cpp similarity index 100% rename from src/chapter_writer.cpp rename to src/common/chapter_writer.cpp diff --git a/src/chapters.cpp b/src/common/chapters.cpp similarity index 100% rename from src/chapters.cpp rename to src/common/chapters.cpp diff --git a/src/chapters.h b/src/common/chapters.h similarity index 100% rename from src/chapters.h rename to src/common/chapters.h diff --git a/src/common.cpp b/src/common/common.cpp similarity index 100% rename from src/common.cpp rename to src/common/common.cpp diff --git a/src/common.h b/src/common/common.h similarity index 100% rename from src/common.h rename to src/common/common.h diff --git a/src/compression.cpp b/src/common/compression.cpp similarity index 100% rename from src/compression.cpp rename to src/common/compression.cpp diff --git a/src/compression.h b/src/common/compression.h similarity index 100% rename from src/compression.h rename to src/common/compression.h diff --git a/src/dts_common.cpp b/src/common/dts_common.cpp similarity index 100% rename from src/dts_common.cpp rename to src/common/dts_common.cpp diff --git a/src/dts_common.h b/src/common/dts_common.h similarity index 100% rename from src/dts_common.h rename to src/common/dts_common.h diff --git a/src/error.h b/src/common/error.h similarity index 100% rename from src/error.h rename to src/common/error.h diff --git a/src/iso639.cpp b/src/common/iso639.cpp similarity index 100% rename from src/iso639.cpp rename to src/common/iso639.cpp diff --git a/src/iso639.h b/src/common/iso639.h similarity index 100% rename from src/iso639.h rename to src/common/iso639.h diff --git a/src/matroska.h b/src/common/matroska.h similarity index 100% rename from src/matroska.h rename to src/common/matroska.h diff --git a/src/mm_io.cpp b/src/common/mm_io.cpp similarity index 100% rename from src/mm_io.cpp rename to src/common/mm_io.cpp diff --git a/src/mm_io.h b/src/common/mm_io.h similarity index 100% rename from src/mm_io.h rename to src/common/mm_io.h diff --git a/src/mp3_common.cpp b/src/common/mp3_common.cpp similarity index 100% rename from src/mp3_common.cpp rename to src/common/mp3_common.cpp diff --git a/src/mp3_common.h b/src/common/mp3_common.h similarity index 100% rename from src/mp3_common.h rename to src/common/mp3_common.h diff --git a/src/ogmstreams.h b/src/common/ogmstreams.h similarity index 100% rename from src/ogmstreams.h rename to src/common/ogmstreams.h diff --git a/src/os.h b/src/common/os.h similarity index 100% rename from src/os.h rename to src/common/os.h diff --git a/src/tagparser.h b/src/common/tagparser.h similarity index 100% rename from src/tagparser.h rename to src/common/tagparser.h diff --git a/src/tagparser_end.cpp b/src/common/tagparser_end.cpp similarity index 100% rename from src/tagparser_end.cpp rename to src/common/tagparser_end.cpp diff --git a/src/tagparser_start.cpp b/src/common/tagparser_start.cpp similarity index 100% rename from src/tagparser_start.cpp rename to src/common/tagparser_start.cpp diff --git a/src/tagwriter.cpp b/src/common/tagwriter.cpp similarity index 100% rename from src/tagwriter.cpp rename to src/common/tagwriter.cpp diff --git a/src/tagwriter.h b/src/common/tagwriter.h similarity index 100% rename from src/tagwriter.h rename to src/common/tagwriter.h diff --git a/src/qtmp4_atoms.h b/src/input/qtmp4_atoms.h similarity index 100% rename from src/qtmp4_atoms.h rename to src/input/qtmp4_atoms.h diff --git a/src/r_aac.cpp b/src/input/r_aac.cpp similarity index 100% rename from src/r_aac.cpp rename to src/input/r_aac.cpp diff --git a/src/r_aac.h b/src/input/r_aac.h similarity index 100% rename from src/r_aac.h rename to src/input/r_aac.h diff --git a/src/r_ac3.cpp b/src/input/r_ac3.cpp similarity index 100% rename from src/r_ac3.cpp rename to src/input/r_ac3.cpp diff --git a/src/r_ac3.h b/src/input/r_ac3.h similarity index 100% rename from src/r_ac3.h rename to src/input/r_ac3.h diff --git a/src/r_avi.cpp b/src/input/r_avi.cpp similarity index 100% rename from src/r_avi.cpp rename to src/input/r_avi.cpp diff --git a/src/r_avi.h b/src/input/r_avi.h similarity index 100% rename from src/r_avi.h rename to src/input/r_avi.h diff --git a/src/r_dts.cpp b/src/input/r_dts.cpp similarity index 100% rename from src/r_dts.cpp rename to src/input/r_dts.cpp diff --git a/src/r_dts.h b/src/input/r_dts.h similarity index 100% rename from src/r_dts.h rename to src/input/r_dts.h diff --git a/src/r_matroska.cpp b/src/input/r_matroska.cpp similarity index 100% rename from src/r_matroska.cpp rename to src/input/r_matroska.cpp diff --git a/src/r_matroska.h b/src/input/r_matroska.h similarity index 100% rename from src/r_matroska.h rename to src/input/r_matroska.h diff --git a/src/r_microdvd.cpp b/src/input/r_microdvd.cpp similarity index 100% rename from src/r_microdvd.cpp rename to src/input/r_microdvd.cpp diff --git a/src/r_microdvd.h b/src/input/r_microdvd.h similarity index 100% rename from src/r_microdvd.h rename to src/input/r_microdvd.h diff --git a/src/r_mp3.cpp b/src/input/r_mp3.cpp similarity index 100% rename from src/r_mp3.cpp rename to src/input/r_mp3.cpp diff --git a/src/r_mp3.h b/src/input/r_mp3.h similarity index 100% rename from src/r_mp3.h rename to src/input/r_mp3.h diff --git a/src/r_ogm.cpp b/src/input/r_ogm.cpp similarity index 100% rename from src/r_ogm.cpp rename to src/input/r_ogm.cpp diff --git a/src/r_ogm.h b/src/input/r_ogm.h similarity index 100% rename from src/r_ogm.h rename to src/input/r_ogm.h diff --git a/src/r_qtmp4.cpp b/src/input/r_qtmp4.cpp similarity index 100% rename from src/r_qtmp4.cpp rename to src/input/r_qtmp4.cpp diff --git a/src/r_qtmp4.h b/src/input/r_qtmp4.h similarity index 100% rename from src/r_qtmp4.h rename to src/input/r_qtmp4.h diff --git a/src/r_real.cpp b/src/input/r_real.cpp similarity index 100% rename from src/r_real.cpp rename to src/input/r_real.cpp diff --git a/src/r_real.h b/src/input/r_real.h similarity index 100% rename from src/r_real.h rename to src/input/r_real.h diff --git a/src/r_srt.cpp b/src/input/r_srt.cpp similarity index 100% rename from src/r_srt.cpp rename to src/input/r_srt.cpp diff --git a/src/r_srt.h b/src/input/r_srt.h similarity index 100% rename from src/r_srt.h rename to src/input/r_srt.h diff --git a/src/r_ssa.cpp b/src/input/r_ssa.cpp similarity index 100% rename from src/r_ssa.cpp rename to src/input/r_ssa.cpp diff --git a/src/r_ssa.h b/src/input/r_ssa.h similarity index 100% rename from src/r_ssa.h rename to src/input/r_ssa.h diff --git a/src/r_vobsub.cpp b/src/input/r_vobsub.cpp similarity index 100% rename from src/r_vobsub.cpp rename to src/input/r_vobsub.cpp diff --git a/src/r_vobsub.h b/src/input/r_vobsub.h similarity index 100% rename from src/r_vobsub.h rename to src/input/r_vobsub.h diff --git a/src/r_wav.cpp b/src/input/r_wav.cpp similarity index 100% rename from src/r_wav.cpp rename to src/input/r_wav.cpp diff --git a/src/r_wav.h b/src/input/r_wav.h similarity index 100% rename from src/r_wav.h rename to src/input/r_wav.h diff --git a/src/subtitles.cpp b/src/input/subtitles.cpp similarity index 100% rename from src/subtitles.cpp rename to src/input/subtitles.cpp diff --git a/src/subtitles.h b/src/input/subtitles.h similarity index 100% rename from src/subtitles.h rename to src/input/subtitles.h diff --git a/src/p_aac.cpp b/src/output/p_aac.cpp similarity index 100% rename from src/p_aac.cpp rename to src/output/p_aac.cpp diff --git a/src/p_aac.h b/src/output/p_aac.h similarity index 100% rename from src/p_aac.h rename to src/output/p_aac.h diff --git a/src/p_ac3.cpp b/src/output/p_ac3.cpp similarity index 100% rename from src/p_ac3.cpp rename to src/output/p_ac3.cpp diff --git a/src/p_ac3.h b/src/output/p_ac3.h similarity index 100% rename from src/p_ac3.h rename to src/output/p_ac3.h diff --git a/src/p_dts.cpp b/src/output/p_dts.cpp similarity index 100% rename from src/p_dts.cpp rename to src/output/p_dts.cpp diff --git a/src/p_dts.h b/src/output/p_dts.h similarity index 100% rename from src/p_dts.h rename to src/output/p_dts.h diff --git a/src/p_mp3.cpp b/src/output/p_mp3.cpp similarity index 100% rename from src/p_mp3.cpp rename to src/output/p_mp3.cpp diff --git a/src/p_mp3.h b/src/output/p_mp3.h similarity index 100% rename from src/p_mp3.h rename to src/output/p_mp3.h diff --git a/src/p_passthrough.cpp b/src/output/p_passthrough.cpp similarity index 100% rename from src/p_passthrough.cpp rename to src/output/p_passthrough.cpp diff --git a/src/p_passthrough.h b/src/output/p_passthrough.h similarity index 100% rename from src/p_passthrough.h rename to src/output/p_passthrough.h diff --git a/src/p_pcm.cpp b/src/output/p_pcm.cpp similarity index 100% rename from src/p_pcm.cpp rename to src/output/p_pcm.cpp diff --git a/src/p_pcm.h b/src/output/p_pcm.h similarity index 100% rename from src/p_pcm.h rename to src/output/p_pcm.h diff --git a/src/p_textsubs.cpp b/src/output/p_textsubs.cpp similarity index 100% rename from src/p_textsubs.cpp rename to src/output/p_textsubs.cpp diff --git a/src/p_textsubs.h b/src/output/p_textsubs.h similarity index 100% rename from src/p_textsubs.h rename to src/output/p_textsubs.h diff --git a/src/p_video.cpp b/src/output/p_video.cpp similarity index 100% rename from src/p_video.cpp rename to src/output/p_video.cpp diff --git a/src/p_video.h b/src/output/p_video.h similarity index 100% rename from src/p_video.h rename to src/output/p_video.h diff --git a/src/p_vobsub.cpp b/src/output/p_vobsub.cpp similarity index 100% rename from src/p_vobsub.cpp rename to src/output/p_vobsub.cpp diff --git a/src/p_vobsub.h b/src/output/p_vobsub.h similarity index 100% rename from src/p_vobsub.h rename to src/output/p_vobsub.h diff --git a/src/p_vorbis.cpp b/src/output/p_vorbis.cpp similarity index 100% rename from src/p_vorbis.cpp rename to src/output/p_vorbis.cpp diff --git a/src/p_vorbis.h b/src/output/p_vorbis.h similarity index 100% rename from src/p_vorbis.h rename to src/output/p_vorbis.h