[xiph-commits] r16033 - branches/theora-thusnelda

[giles at svn.xiph.org]

Author: giles
Date: 2009-05-26 11:29:00 -0700 (Tue, 26 May 2009)
New Revision: 16033

Modified:
   branches/theora-thusnelda/SConstruct
Log:
Remove the legacy libtheora target from the scons build.

We just make the new-style libtheoraenc/libtheoradec targets now. Also,
install the new libraries; previously we built all three but only installed
the legacy library.

Modified: branches/theora-thusnelda/SConstruct
===================================================================
--- branches/theora-thusnelda/SConstruct	2009-05-26 18:28:54 UTC (rev 16032)
+++ branches/theora-thusnelda/SConstruct	2009-05-26 18:29:00 UTC (rev 16033)
@@ -132,7 +132,6 @@
 
 libtheoradec_Sources = Split(decoder_sources)
 libtheoraenc_Sources = Split(encoder_sources)
-libtheora_Sources = Split(decoder_sources + encoder_sources)
 
 libtheoradec_a = env.Library('lib/theoradec',
 	path('lib', libtheoradec_Sources))
@@ -144,16 +143,12 @@
 libtheoraenc_so = env.SharedLibrary('lib/theoraenc',
 	path('lib', libtheoraenc_Sources) + [libtheoradec_so])
 
-libtheora_a = env.Library('lib/theora',
-	path('lib', libtheora_Sources))
-libtheora_so = env.SharedLibrary('lib/theora',
-	path('lib', libtheora_Sources))
-
 #installing
 prefix='/usr'
 lib_dir = prefix + '/lib'
 env.Alias('install', prefix)
-env.Install(lib_dir, [libtheora_a, libtheora_so])
+env.Install(lib_dir, [libtheoradec_a, libtheoradec_so])
+env.Install(lib_dir, [libtheoraenc_a, libtheoraenc_so])
 
 # example programs
 dump_video = env.Clone()