# HG changeset patch
# User diego
# Date 1208905527 0
# Node ID f29c190fdb10514d4f032cb145f30c53aa9073e5
# Parent  26637ed377deb2728bf9e575628345a88dc53edf
Merge tremor/Makefile into top-level Makefile.

diff -r 26637ed377de -r f29c190fdb10 Makefile
--- a/Makefile	Tue Apr 22 22:55:55 2008 +0000
+++ b/Makefile	Tue Apr 22 23:05:27 2008 +0000
@@ -86,6 +86,21 @@
 SRCS_COMMON-$(NEED_STRSEP)           += osdep/strsep.c
 SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
 SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
+SRCS_COMMON-$(TREMOR_INTERNAL)       += tremor/bitwise.c \
+                                        tremor/block.c \
+                                        tremor/codebook.c \
+                                        tremor/floor0.c \
+                                        tremor/floor1.c \
+                                        tremor/framing.c \
+                                        tremor/info.c \
+                                        tremor/mapping0.c \
+                                        tremor/mdct.c \
+                                        tremor/registry.c \
+                                        tremor/res012.c \
+                                        tremor/sharedbook.c \
+                                        tremor/synthesis.c \
+                                        tremor/window.c \
+
 SRCS_COMMON-$(UNRAR_EXEC)            += unrar_exec.c
 
 SRCS_MPLAYER = mplayer.c \
@@ -172,7 +187,6 @@
 COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
 COMMON_LIBS-$(LIBMPEG2)           += libmpeg2/libmpeg2.a
 COMMON_LIBS-$(FAAD_INTERNAL)      += libfaad2/libfaad2.a
-COMMON_LIBS-$(TREMOR_INTERNAL)    += tremor/tremor.a
 COMMON_LIBS-$(DVDREAD_INTERNAL)   += dvdread/dvdread.a
 COMMON_LIBS-$(DVDCSS_INTERNAL)    += libdvdcss/libdvdcss.a
 
@@ -216,7 +230,6 @@
         libvo \
         mp3lib \
         stream \
-        tremor \
         vidix \
 
 ifdef ARCH_X86
@@ -234,6 +247,7 @@
         libass \
         libmenu \
         osdep \
+        tremor \
         TOOLS \
 
 all:	recurse $(ALL_PRG)
diff -r 26637ed377de -r f29c190fdb10 tremor/Makefile
--- a/tremor/Makefile	Tue Apr 22 22:55:55 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = tremor.a
-
-SRCS_COMMON = bitwise.c \
-              block.c \
-              codebook.c \
-              floor0.c \
-              floor1.c \
-              framing.c \
-              info.c \
-              mapping0.c \
-              mdct.c \
-              registry.c \
-              res012.c \
-              sharedbook.c \
-              synthesis.c \
-              window.c \
-
-include ../mpcommon.mak