summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-22 23:05:27 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-22 23:05:27 +0000
commit36add9a774d328e448621780518477c84888fd08 (patch)
treebf98ea211bd0bc977f982ae8a006aedcde6d4a08
parent8784ae223db23a8c975fd0ddc0174637e0ce4076 (diff)
downloadmpv-36add9a774d328e448621780518477c84888fd08.tar.bz2
mpv-36add9a774d328e448621780518477c84888fd08.tar.xz
Merge tremor/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile18
-rw-r--r--tremor/Makefile20
2 files changed, 16 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index dfcf2e59d8..0f44319cd0 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,21 @@ SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
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-$(MP3LIB) += mp3lib/mp3lib.a
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 @@ PARTS = dvdread \
libvo \
mp3lib \
stream \
- tremor \
vidix \
ifdef ARCH_X86
@@ -234,6 +247,7 @@ DIRS = gui \
libass \
libmenu \
osdep \
+ tremor \
TOOLS \
all: recurse $(ALL_PRG)
diff --git a/tremor/Makefile b/tremor/Makefile
deleted file mode 100644
index 2817bc685b..0000000000
--- a/tremor/Makefile
+++ /dev/null
@@ -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