Directory reorganization.

2024-12-25 04:11:44 +00:00 · 2003-11-01 13:34:55 +00:00 · 2003-11-01 13:34:55 +00:00 · 20ca2d9c26
commit 20ca2d9c26
parent 9c0208b224
84 changed files with 20 additions and 17 deletions
--- 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@
--- a/src/common/aac_common.cpp
+++ b/src/common/aac_common.cpp
--- a/src/common/aac_common.h
+++ b/src/common/aac_common.h
--- a/src/common/ac3_common.cpp
+++ b/src/common/ac3_common.cpp
--- a/src/common/ac3_common.h
+++ b/src/common/ac3_common.h
--- a/src/common/base64.cpp
+++ b/src/common/base64.cpp
--- a/src/common/base64.h
+++ b/src/common/base64.h
--- a/src/common/byte_buffer.h
+++ b/src/common/byte_buffer.h
--- a/src/common/chapter_parser_xml.cpp
+++ b/src/common/chapter_parser_xml.cpp
--- a/src/common/chapter_writer.cpp
+++ b/src/common/chapter_writer.cpp
--- a/src/common/chapters.cpp
+++ b/src/common/chapters.cpp
--- a/src/common/chapters.h
+++ b/src/common/chapters.h
--- a/src/common/common.cpp
+++ b/src/common/common.cpp
--- a/src/common/common.h
+++ b/src/common/common.h
--- a/src/common/compression.cpp
+++ b/src/common/compression.cpp
--- a/src/common/compression.h
+++ b/src/common/compression.h
--- a/src/common/dts_common.cpp
+++ b/src/common/dts_common.cpp
--- a/src/common/dts_common.h
+++ b/src/common/dts_common.h
--- a/src/common/error.h
+++ b/src/common/error.h
--- a/src/common/iso639.cpp
+++ b/src/common/iso639.cpp
--- a/src/common/iso639.h
+++ b/src/common/iso639.h
--- a/src/common/matroska.h
+++ b/src/common/matroska.h
--- a/src/common/mm_io.cpp
+++ b/src/common/mm_io.cpp
--- a/src/common/mm_io.h
+++ b/src/common/mm_io.h
--- a/src/common/mp3_common.cpp
+++ b/src/common/mp3_common.cpp
--- a/src/common/mp3_common.h
+++ b/src/common/mp3_common.h
--- a/src/common/ogmstreams.h
+++ b/src/common/ogmstreams.h
--- a/src/common/os.h
+++ b/src/common/os.h
--- a/src/common/tagparser.h
+++ b/src/common/tagparser.h
--- a/src/common/tagparser_end.cpp
+++ b/src/common/tagparser_end.cpp
--- a/src/common/tagparser_start.cpp
+++ b/src/common/tagparser_start.cpp
--- a/src/common/tagwriter.cpp
+++ b/src/common/tagwriter.cpp
--- a/src/common/tagwriter.h
+++ b/src/common/tagwriter.h
--- a/src/input/qtmp4_atoms.h
+++ b/src/input/qtmp4_atoms.h
--- a/src/input/r_aac.cpp
+++ b/src/input/r_aac.cpp
--- a/src/input/r_aac.h
+++ b/src/input/r_aac.h
--- a/src/input/r_ac3.cpp
+++ b/src/input/r_ac3.cpp
--- a/src/input/r_ac3.h
+++ b/src/input/r_ac3.h
--- a/src/input/r_avi.cpp
+++ b/src/input/r_avi.cpp
--- a/src/input/r_avi.h
+++ b/src/input/r_avi.h
--- a/src/input/r_dts.cpp
+++ b/src/input/r_dts.cpp
--- a/src/input/r_dts.h
+++ b/src/input/r_dts.h
--- a/src/input/r_matroska.cpp
+++ b/src/input/r_matroska.cpp
--- a/src/input/r_matroska.h
+++ b/src/input/r_matroska.h
--- a/src/input/r_microdvd.cpp
+++ b/src/input/r_microdvd.cpp
--- a/src/input/r_microdvd.h
+++ b/src/input/r_microdvd.h
--- a/src/input/r_mp3.cpp
+++ b/src/input/r_mp3.cpp
--- a/src/input/r_mp3.h
+++ b/src/input/r_mp3.h
--- a/src/input/r_ogm.cpp
+++ b/src/input/r_ogm.cpp
--- a/src/input/r_ogm.h
+++ b/src/input/r_ogm.h
--- a/src/input/r_qtmp4.cpp
+++ b/src/input/r_qtmp4.cpp
--- a/src/input/r_qtmp4.h
+++ b/src/input/r_qtmp4.h
--- a/src/input/r_real.cpp
+++ b/src/input/r_real.cpp
--- a/src/input/r_real.h
+++ b/src/input/r_real.h
--- a/src/input/r_srt.cpp
+++ b/src/input/r_srt.cpp
--- a/src/input/r_srt.h
+++ b/src/input/r_srt.h
--- a/src/input/r_ssa.cpp
+++ b/src/input/r_ssa.cpp
--- a/src/input/r_ssa.h
+++ b/src/input/r_ssa.h
--- a/src/input/r_vobsub.cpp
+++ b/src/input/r_vobsub.cpp
--- a/src/input/r_vobsub.h
+++ b/src/input/r_vobsub.h
--- a/src/input/r_wav.cpp
+++ b/src/input/r_wav.cpp
--- a/src/input/r_wav.h
+++ b/src/input/r_wav.h
--- a/src/input/subtitles.cpp
+++ b/src/input/subtitles.cpp
--- a/src/input/subtitles.h
+++ b/src/input/subtitles.h
--- a/src/output/p_aac.cpp
+++ b/src/output/p_aac.cpp
--- a/src/output/p_aac.h
+++ b/src/output/p_aac.h
--- a/src/output/p_ac3.cpp
+++ b/src/output/p_ac3.cpp
--- a/src/output/p_ac3.h
+++ b/src/output/p_ac3.h
--- a/src/output/p_dts.cpp
+++ b/src/output/p_dts.cpp
--- a/src/output/p_dts.h
+++ b/src/output/p_dts.h
--- a/src/output/p_mp3.cpp
+++ b/src/output/p_mp3.cpp
--- a/src/output/p_mp3.h
+++ b/src/output/p_mp3.h
--- a/src/output/p_passthrough.cpp
+++ b/src/output/p_passthrough.cpp
--- a/src/output/p_passthrough.h
+++ b/src/output/p_passthrough.h
--- a/src/output/p_pcm.cpp
+++ b/src/output/p_pcm.cpp
--- a/src/output/p_pcm.h
+++ b/src/output/p_pcm.h
--- a/src/output/p_textsubs.cpp
+++ b/src/output/p_textsubs.cpp
--- a/src/output/p_textsubs.h
+++ b/src/output/p_textsubs.h
--- a/src/output/p_video.cpp
+++ b/src/output/p_video.cpp
--- a/src/output/p_video.h
+++ b/src/output/p_video.h
--- a/src/output/p_vobsub.cpp
+++ b/src/output/p_vobsub.cpp
--- a/src/output/p_vobsub.h
+++ b/src/output/p_vobsub.h
--- a/src/output/p_vorbis.cpp
+++ b/src/output/p_vorbis.cpp
--- a/src/output/p_vorbis.h
+++ b/src/output/p_vorbis.h