[xiph-commits] r12705 - in experimental/j/theora-mashup: . lib lib/dec lib/enc

[j at svn.xiph.org]

Author: j
Date: 2007-03-10 09:49:32 -0800 (Sat, 10 Mar 2007)
New Revision: 12705

Added:
   experimental/j/theora-mashup/lib/
   experimental/j/theora-mashup/lib/dec/
   experimental/j/theora-mashup/lib/enc/
Removed:
   experimental/j/theora-mashup/dec/
   experimental/j/theora-mashup/enc/
   experimental/j/theora-mashup/lib/dec/Makefile.am
   experimental/j/theora-mashup/lib/enc/Makefile.am
Modified:
   experimental/j/theora-mashup/configure.ac
Log:
move part2, add new Makefile.am

Modified: experimental/j/theora-mashup/configure.ac
===================================================================
--- experimental/j/theora-mashup/configure.ac	2007-03-10 17:47:08 UTC (rev 12704)
+++ experimental/j/theora-mashup/configure.ac	2007-03-10 17:49:32 UTC (rev 12705)
@@ -10,7 +10,7 @@
 AC_CANONICAL_TARGET
 
 AM_CONFIG_HEADER([config.h])
-AC_CONFIG_SRCDIR([lib/dct.c])
+AC_CONFIG_SRCDIR([lib/enc/dct.c])
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
@@ -291,7 +291,8 @@
 AC_SUBST(PROFILE)
 
 AC_OUTPUT([
-  Makefile lib/Makefile
+  Makefile 
+  lib/Makefile
   include/Makefile include/theora/Makefile
   examples/Makefile
   doc/Makefile doc/Doxyfile

Copied: experimental/j/theora-mashup/lib/dec (from rev 12704, experimental/j/theora-mashup/dec)

Deleted: experimental/j/theora-mashup/lib/dec/Makefile.am
===================================================================
--- experimental/j/theora-mashup/dec/Makefile.am	2007-03-10 17:47:08 UTC (rev 12704)
+++ experimental/j/theora-mashup/lib/dec/Makefile.am	2007-03-10 17:49:32 UTC (rev 12705)
@@ -1,80 +0,0 @@
-if TH_ENCODER
-ENCODER_LA=libtheoraenc.la
-else
-ENCODER_LA=
-endif
-
-lib_LTLIBRARIES = libtheoradec.la libtheoracompat.la $(ENCODER_LA)
-
-INCLUDES = -I $(top_srcdir)/include -I $(top_srcdir)/include/theora/compat
-AM_CFLAGS = $(OGG_CFLAGS) $(OPTIMIZATION_CFLAGS)
-
-EXTRA_DIST = \
-	x86/cpu.c \
-	x86/mmxidct.c \
-	x86/mmxfrag.c \
-	x86/mmxstate.c \
-	x86/x86state.c
-
-if OC_X86ASM
-X86ASM_FILES = \
-	x86/cpu.c \
-	x86/mmxidct.c \
-	x86/mmxfrag.c \
-	x86/mmxstate.c \
-	x86/x86state.c
-endif
-
-noinst_HEADERS = \
-	dct.h \
-	decint.h \
-	dequant.h \
-	encint.h \
-	enquant.h \
-	encvbr.h \
-	fdct.h \
-	huffdec.h \
-	huffenc.h \
-	huffman.h \
-	idct.h \
-	internal.h \
-	ocintrin.h \
-	psych.h \
-	quant.h \
-	x86/cpu.h \
-	x86/x86int.h
-
-libtheoracompat_la_SOURCES = \
-	apiwrapper.c
-  
-libtheoradec_la_SOURCES = \
-	decinfo.c \
-	decode.c \
-	dequant.c \
-	fragment.c \
-	huffdec.c \
-	idct.c \
-	info.c \
-	internal.c \
-	quant.c \
-	state.c  \
-	$(X86ASM_FILES)
-
-
-libtheoradec_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @OGG_LIBS@
-
-libtheoraenc_la_SOURCES = \
-	bitrate.c \
-	encinfo.c \
-	encode.c \
-	encmsc.c \
-	encvbr.c \
-	enquant.c \
-	fdct.c \
-	huffenc.c \
-	impmap.c \
-	mcenc.c \
-	psych.c
-
-libtheoraenc_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @OGG_LIBS@
-

Copied: experimental/j/theora-mashup/lib/enc (from rev 12704, experimental/j/theora-mashup/enc)

Deleted: experimental/j/theora-mashup/lib/enc/Makefile.am
===================================================================
--- experimental/j/theora-mashup/enc/Makefile.am	2007-03-10 17:47:08 UTC (rev 12704)
+++ experimental/j/theora-mashup/lib/enc/Makefile.am	2007-03-10 17:49:32 UTC (rev 12705)
@@ -1,91 +0,0 @@
-INCLUDES = -I$(top_srcdir)/include
-
-EXTRA_DIST = Version_script.in \
-	x86_32/dsp_mmx.c \
-	x86_32/dsp_mmxext.c \
-	x86_32/recon_mmx.c \
-	x86_32/fdct_mmx.c \
-	x86_64/dsp_mmx.c \
-	x86_64/dsp_mmxext.c \
-	x86_64/recon_mmx.c \
-	x86_64/fdct_mmx.c \
-	x86_32_vs/dsp_mmx.c \
-	x86_32_vs/fdct_mmx.c \
-	x86_32_vs/recon_mmx.c \
-	encoder_disabled.c \
-	dct_encode.c \
-	encode.c \
-	encoder_toplevel.c
-
-lib_LTLIBRARIES = libtheora.la
-
-if THEORA_DISABLE_ENCODE
-encoder_sources = encoder_disabled.c
-else
-encoder_sources = dct_encode.c encode.c encoder_toplevel.c
-endif
-
-if CPU_x86_64
-arch_dir = x86_64
-arch_sources= \
-	$(arch_dir)/dsp_mmx.c \
-	$(arch_dir)/dsp_mmxext.c \
-	$(arch_dir)/recon_mmx.c \
-	$(arch_dir)/fdct_mmx.c
-else
-if CPU_x86_32
-arch_dir = x86_32
-arch_sources= \
-	$(arch_dir)/dsp_mmx.c \
-	$(arch_dir)/dsp_mmxext.c \
-	$(arch_dir)/recon_mmx.c \
-	$(arch_dir)/fdct_mmx.c
-endif
-endif
-
-
-libtheora_la_SOURCES = \
-	blockmap.c \
-	comment.c \
-	dct.c \
-	dct_decode.c \
-	decode.c \
-	frarray.c \
-	frinit.c \
-	huffman.c \
-	idct.c \
-	mcomp.c \
-	misc_common.c \
-	pb.c \
-	pp.c \
-	quant.c \
-	reconstruct.c \
-	scan.c \
-	toplevel.c \
-	cpu.c \
-	dsp.c \
-  $(arch_sources) \
-	$(encoder_sources)
-
-noinst_HEADERS = \
-	block_inline.h \
-	codec_internal.h \
-	encoder_lookup.h \
-	huffman.h \
-	hufftables.h \
-	pp.h \
-	quant_lookup.h \
-	toplevel.h \
-	toplevel_lookup.h \
-	cpu.h \
-	dsp.h
-
-libtheora_la_CFLAGS = $(OGG_CFLAGS)
-libtheora_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @SHLIB_VERSION_ARG@
-libtheora_la_LIBADD = $(OGG_LIBS)
-
-debug:
-	$(MAKE) all CFLAGS="@DEBUG@" LDFLAGS="-lefence"	
-
-profile:
-	$(MAKE) all CFLAGS="@PROFILE@"