[xiph-commits] r15606 - trunk/theora/lib

[msmith at svn.xiph.org]

Author: msmith
Date: 2009-01-05 15:51:43 -0800 (Mon, 05 Jan 2009)
New Revision: 15606

Modified:
   trunk/theora/lib/Makefile.am
Log:
Link libtheoraenc with libtheoradec; this is required on windows.
Also pass -no-undefined to libtool, as otherwise libtool won't try
to build dynamic libs on windows.


Modified: trunk/theora/lib/Makefile.am
===================================================================
--- trunk/theora/lib/Makefile.am	2009-01-05 22:07:43 UTC (rev 15605)
+++ trunk/theora/lib/Makefile.am	2009-01-05 23:51:43 UTC (rev 15606)
@@ -134,7 +134,7 @@
 	$(decoder_sources) \
   Version_script-dec
 libtheoradec_la_LDFLAGS = \
-  -version-info @THDEC_LIB_CURRENT@:@THDEC_LIB_REVISION@:@THDEC_LIB_AGE@ \
+  -no-undefined -version-info @THDEC_LIB_CURRENT@:@THDEC_LIB_REVISION@:@THDEC_LIB_AGE@ \
   @THEORADEC_LDFLAGS@
 
 libtheoraenc_la_SOURCES = \
@@ -142,7 +142,8 @@
 	$(encoder_sources) \
   Version_script-enc
 libtheoraenc_la_LDFLAGS = \
-  -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
+  -no-undefined -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
+  $(top_builddir)/lib/libtheoradec.la \
   @THEORAENC_LDFLAGS@ $(OGG_LIBS)
 
 libtheora_la_SOURCES = \
@@ -152,7 +153,7 @@
 	$(encoder_sources) \
   Version_script
 libtheora_la_LDFLAGS = \
-  -version-info @TH_LIB_CURRENT@:@TH_LIB_REVISION@:@TH_LIB_AGE@ \
+  -no-undefined -version-info @TH_LIB_CURRENT@:@TH_LIB_REVISION@:@TH_LIB_AGE@ \
   @THEORA_LDFLAGS@ $(OGG_LIBS)
 
 debug: