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

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2011-02-10 10:33:25 -0800 (Thu, 10 Feb 2011)
New Revision: 17822

Modified:
   trunk/theora/lib/Makefile.am
Log:
Update Makefile.am to exclude generated ARM .S files from distribution.


Modified: trunk/theora/lib/Makefile.am
===================================================================
--- trunk/theora/lib/Makefile.am	2011-02-09 22:08:34 UTC (rev 17821)
+++ trunk/theora/lib/Makefile.am	2011-02-10 18:33:25 UTC (rev 17822)
@@ -89,20 +89,28 @@
 encoder_uniq_arch_sources = \
  $(encoder_uniq_x86_sources) \
  $(encoder_uniq_x86_64_sources)
+nodist_encoder_uniq_arch_sources =
 encoder_shared_arch_sources = \
  $(encoder_shared_x86_sources) \
  $(encoder_shared_x86_64_sources)
+nodist_encoder_shared_arch_sources =
 else
 if CPU_x86_32
 encoder_uniq_arch_sources = $(encoder_uniq_x86_sources)
+nodist_encoder_uniq_arch_sources =
 encoder_shared_arch_sources = $(encoder_shared_x86_sources)
+nodist_encoder_shared_arch_sources =
 else
 if CPU_arm
-encoder_uniq_arch_sources = $(encoder_uniq_arm_sources)
-encoder_shared_arch_sources = $(encoder_shared_arm_sources)
+encoder_uniq_arch_sources =
+nodist_encoder_uniq_arch_sources = $(encoder_uniq_arm_sources)
+encoder_shared_arch_sources =
+nodist_encoder_shared_arch_sources = $(encoder_shared_arm_sources)
 else
 encoder_uniq_arch_sources =
+nodist_encoder_uniq_arch_sources =
 encoder_shared_arch_sources =
+nodist_encoder_shared_arch_sources =
 endif
 endif
 endif
@@ -134,6 +142,10 @@
 	$(encoder_shared_arch_sources) \
 	$(encoder_uniq_sources)
 
+nodist_encoder_arch_sources =
+	$(nodist_encoder_shared_arch_sources) \
+	$(nodist_encoder_uniq_sources)
+
 endif
 
 decoder_x86_sources = \
@@ -240,6 +252,8 @@
 libtheoraenc_la_SOURCES = \
 	$(encoder_sources) \
 	Version_script-enc theoraenc.exp
+nodist_libtheoraenc_la_SOURCES = \
+	$(nodist_encoder_arch_sources)
 libtheoraenc_la_LDFLAGS = \
   -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
   @THEORAENC_LDFLAGS@ $(OGG_LIBS) \
@@ -252,6 +266,7 @@
 	Version_script theora.exp
 nodist_libtheora_la_SOURCES = \
 	$(nodist_decoder_arch_sources)
+	$(nodist_encoder_uniq_arch_sources)
 libtheora_la_LDFLAGS = \
   -version-info @TH_LIB_CURRENT@:@TH_LIB_REVISION@:@TH_LIB_AGE@ \
   @THEORA_LDFLAGS@ @CAIRO_LIBS@ $(OGG_LIBS) \