[xiph-commits] r8756 - trunk/oggdsf/unix

[ozone at motherfish-iii.xiph.org]

Author: ozone
Date: 2005-01-14 01:05:48 -0800 (Fri, 14 Jan 2005)
New Revision: 8756

Modified:
   trunk/oggdsf/unix/Makefile.am
Log:
oggdsf:
 * Build CMMLDump, testOOOggChef and libTemporalURI on UNIX
 * Fix up builds of libCMMLParse and libOOOggChef to include all its classes



Modified: trunk/oggdsf/unix/Makefile.am
===================================================================
--- trunk/oggdsf/unix/Makefile.am	2005-01-14 09:03:14 UTC (rev 8755)
+++ trunk/oggdsf/unix/Makefile.am	2005-01-14 09:05:48 UTC (rev 8756)
@@ -5,6 +5,7 @@
 NULL =
 
 bin_PROGRAMS = \
+	CMMLDump \
 	OOOggDump \
 	OOOggValidate \
 	OOOggStat \
@@ -16,7 +17,9 @@
 	$(NULL)
 
 noinst_PROGRAMS = \
-	testCMMLParser
+	testCMMLParser \
+	testOOOggChef \
+	$(NULL)
 
 lib_LTLIBRARIES = \
 	libilliCore.la \
@@ -25,6 +28,7 @@
 	libOOOgg.la \
 	libOOOggChef.la \
 	libOOOggSeek.la \
+	libTemporalURI.la \
 	libVorbisComment.la \
 	$(NULL)
 
@@ -103,9 +107,10 @@
 	../src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h \
 	$(NULL)
 
-
+libCMMLParse_la_LIBADD = libCMMLTags.la libTemporalURI.la
 libCMMLParse_la_SOURCES = \
 	../src/lib/codecs/cmml/libCMMLParse/CMMLParser.cpp \
+	../src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.cpp \
 	../src/lib/codecs/cmml/libCMMLParse/ConvertUTF.c \
 	../src/lib/codecs/cmml/libCMMLParse/xlist.c \
 	../src/lib/codecs/cmml/libCMMLParse/xtag.c \
@@ -113,6 +118,7 @@
 libCMMLParsedir = $(includedir)/libCMMLParse
 libCMMLParse_HEADERS = \
 	../src/lib/codecs/cmml/libCMMLParse/CMMLParser.h \
+	../src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.h \
 	../src/lib/codecs/cmml/libCMMLParse/ConvertUTF.h \
 	../src/lib/codecs/cmml/libCMMLParse/libCMMLParse.h \
 	../src/lib/codecs/cmml/libCMMLParse/stdafx.h \
@@ -121,20 +127,36 @@
 	$(NULL)
 
 
-libOOOggChef_la_LIBADD = libOOOgg.la libOOOggSeek.la
+libOOOggChef_la_LIBADD = libOOOgg.la libOOOggSeek.la libCMMLParse.la libCMMLTags.la libTemporalURI.la
 libOOOggChef_la_SOURCES = \
 	../src/lib/helper/libOOOggChef/AnnodexRecomposer.cpp \
+	../src/lib/helper/libOOOggChef/CMMLRecomposer.cpp \
 	../src/lib/helper/libOOOggChef/IRecomposer.cpp \
+	../src/lib/helper/libOOOggChef/utils.cpp \
 	$(NULL)
 libOOOggChefdir = $(includedir)/libOOOggChef
 libOOOggChef_HEADERS = \
 	../src/lib/helper/libOOOggChef/AnnodexRecomposer.h \
+	../src/lib/helper/libOOOggChef/CMMLRecomposer.h \
 	../src/lib/helper/libOOOggChef/IRecomposer.h \
 	../src/lib/helper/libOOOggChef/libOOOggChef.h \
 	../src/lib/helper/libOOOggChef/stdafx.h \
+	../src/lib/helper/libOOOggChef/utils.h \
 	$(NULL)
 
 
+libTemporalURI_la_LIBADD = libilliCore.la
+libTemporalURI_la_SOURCES = \
+	../src/lib/helper/libTemporalURI/C_TimeStamp.cpp \
+	$(NULL)
+libTemporalURIdir = $(includedir)/libTemporalURI
+libTemporalURI_HEADERS = \
+	../src/lib/helper/libTemporalURI/C_TimeStamp.h \
+	../src/lib/helper/libTemporalURI/libTemporalURI.h \
+	../src/lib/helper/libTemporalURI/stdafx.h \
+	$(NULL)
+
+
 libOOOggSeek_la_LIBADD = libOOOgg.la
 libOOOggSeek_la_SOURCES = \
 	../src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp \
@@ -229,6 +251,11 @@
 # tools
 #
 
+CMMLDump_LDADD = libCMMLParse.la libOOOgg.la
+CMMLDump_SOURCES = \
+	../src/tools/CMMLDump/CMMLDump.cpp \
+	$(NULL)
+
 OOOggDump_LDADD = libOOOgg.la
 OOOggDump_SOURCES = \
 	../src/tools/OOOggDump/OOOggDump.cpp \
@@ -276,7 +303,13 @@
 # Tests
 #
 
-testCMMLParser_LDADD = libilliCore.la libCMMLTags.la libCMMLParse.la
+testCMMLParser_LDADD = libilliCore.la libCMMLTags.la libCMMLParse.la libTemporalURI.la
 testCMMLParser_SOURCES = \
-	../src/tests/testCMMLParser/testCMMLParser.cpp
+	../src/tests/testCMMLParser/testCMMLParser.cpp \
+	$(NULL)
 
+testOOOggChef_LDADD = libilliCore.la libOOOgg.la libOOOggChef.la libOOOggSeek.la
+testOOOggChef_SOURCES = \
+	../src/tests/testOOOggChef/testOOOggChef.cpp \
+	$(NULL)
+