[xiph-commits] r13988 - in trunk/theora-tools: . vp32theora

[giles at svn.xiph.org]

Author: giles
Date: 2007-10-15 10:01:38 -0700 (Mon, 15 Oct 2007)
New Revision: 13988

Modified:
   trunk/theora-tools/Makefile.am
   trunk/theora-tools/configure.ac
   trunk/theora-tools/vp32theora/Makefile.am
Log:
Add vp32theora to the build/dist, but don't install since it needs
some cleanup.


Modified: trunk/theora-tools/Makefile.am
===================================================================
--- trunk/theora-tools/Makefile.am	2007-10-15 16:49:23 UTC (rev 13987)
+++ trunk/theora-tools/Makefile.am	2007-10-15 17:01:38 UTC (rev 13988)
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
 
-SUBDIRS = theoraenc theoracomment png2theora
+SUBDIRS = theoraenc theoracomment png2theora vp32theora
 
 EXTRA_DIST = COPYING autogen.sh
 

Modified: trunk/theora-tools/configure.ac
===================================================================
--- trunk/theora-tools/configure.ac	2007-10-15 16:49:23 UTC (rev 13987)
+++ trunk/theora-tools/configure.ac	2007-10-15 17:01:38 UTC (rev 13988)
@@ -113,5 +113,6 @@
   theoraenc/Makefile
   theoracomment/Makefile
   png2theora/Makefile
+  vp32theora/Makefile
 ])
 AC_OUTPUT

Modified: trunk/theora-tools/vp32theora/Makefile.am
===================================================================
--- trunk/theora-tools/vp32theora/Makefile.am	2007-10-15 16:49:23 UTC (rev 13987)
+++ trunk/theora-tools/vp32theora/Makefile.am	2007-10-15 17:01:38 UTC (rev 13988)
@@ -2,11 +2,9 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-bin_PROGRAMS = theora_transcoder avi2vp3
+noinst_PROGRAMS = vp32theora avi2vp3
 
-LDADD = -ltheora -logg -lvorbis -lm
+vp32theora_SOURCES = theora_transcoder.c
+vp32theora_LDADD = -ltheora -lvorbisenc -lvorbis -logg -lm
 
-theora_transcoder_SOURCES = theora_transcoder.c
-theora_transcoder_LDADD = $(LDADD) -lvorbisenc
-
 avi2vp3_SOURCES = avi2vp3.c avilib.c avilib.h