Mercurial > mplayer.hg

changeset 26522:8003ed4cc8b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge liba52/Makefile into top-level Makefile.
author diego
date Sun, 27 Apr 2008 11:46:56 +0000
parents 4bcaa9a8a860
children 43d28f989428
files Makefile liba52/Makefile
diffstat 2 files changed, 13 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Apr 27 11:00:06 2008 +0000
+++ b/Makefile	Sun Apr 27 11:46:56 2008 +0000
@@ -238,7 +238,15 @@
 SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += libaf/af_export.c
 SRCS_COMMON-$(JPEG)                  += libmpcodecs/vd_ijpg.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
-SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c
+SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c \
+                                        liba52/crc.c \
+                                        liba52/resample.c \
+                                        liba52/bit_allocate.c \
+                                        liba52/bitstream.c \
+                                        liba52/downmix.c \
+                                        liba52/imdct.c \
+                                        liba52/parse.c \
+
 SRCS_COMMON-$(LIBASS)                += libass/ass.c \
                                         libass/ass_bitmap.c \
                                         libass/ass_cache.c \
@@ -574,7 +582,6 @@
 COMMON_LIBS-$(LIBPOSTPROC_A)      += libpostproc/libpostproc.a
 COMMON_LIBS-$(WIN32DLL)           += loader/loader.a
 COMMON_LIBS-$(MP3LIB)             += mp3lib/mp3lib.a
-COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
 
 ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
@@ -592,8 +599,7 @@
 INSTALL_TARGETS-$(GUI)      += install-gui
 INSTALL_TARGETS             += $(INSTALL_TARGETS-yes)
 
-PARTS = liba52 \
-        libavcodec \
+PARTS = libavcodec \
         libavformat \
         libavutil \
         libpostproc \
@@ -612,6 +618,7 @@
         gui/wm \
         gui/win32 \
         input \
+        liba52 \
         libaf \
         libao2 \
         libass \
@@ -696,6 +703,8 @@
 
 vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES)
 
+liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o))
+
 install: install-dirs $(INSTALL_TARGETS)
 
 install-dirs:
--- a/liba52/Makefile	Sun Apr 27 11:00:06 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = liba52.a
-
-SRCS_COMMON = crc.c \
-              resample.c \
-              bit_allocate.c \
-              bitstream.c \
-              downmix.c \
-              imdct.c \
-              parse.c \
-
-include ../mpcommon.mak
-
-test: test.c ../cpudetect.o $(LIBNAME_COMMON)