From 83740c48da575c34b027f9484523e0f983e02885 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 26 Apr 2008 18:02:23 +0000
Subject: Merge libmpeg2/Makefile into top-level Makefile.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile          | 23 ++++++++++++++++++++---
 libmpeg2/Makefile | 20 --------------------
 2 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 libmpeg2/Makefile

diff --git a/Makefile b/Makefile
index a5a65c5ebc..a636bca0ea 100644
--- a/Makefile
+++ b/Makefile
@@ -318,7 +318,25 @@ SRCS_COMMON-$(FAAD_INTERNAL)         += libfaad2/bits.c \
                                         libfaad2/tns.c \
 
 SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
-SRCS_COMMON-$(LIBMPEG2)              += libmpcodecs/vd_libmpeg2.c
+SRCS_COMMON-$(LIBMPEG2)              += libmpcodecs/vd_libmpeg2.c \
+                                        libmpeg2/alloc.c \
+                                        libmpeg2/cpu_accel.c\
+                                        libmpeg2/cpu_state.c \
+                                        libmpeg2/decode.c \
+                                        libmpeg2/header.c \
+                                        libmpeg2/idct.c \
+                                        libmpeg2/motion_comp.c \
+                                        libmpeg2/slice.c
+SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA)   += libmpeg2/idct_alpha.c \
+                                           libmpeg2/motion_comp_alpha.c
+SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARMV4L)  += libmpeg2/motion_comp_arm.c \
+                                           libmpeg2/motion_comp_arm_s.S \
+                                           libmpeg2/motion_comp_iwmmxt.c
+SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
+                                           libmpeg2/motion_comp_altivec.c
+SRCS_COMMON-$(LIBMPEG2)-$(HAVE_MMX)     += libmpeg2/idct_mmx.c \
+                                           libmpeg2/motion_comp_mmx.c
+SRCS_COMMON-$(LIBMPEG2)-$(HAVE_VIS)     += libmpeg2/motion_comp_vis.c
 SRCS_COMMON-$(LIBNEMESI)             += libmpdemux/demux_nemesi.c \
                                         stream/stream_nemesi.c
 SRCS_COMMON-$(LIBNUT)                += libmpdemux/demux_nut.c
@@ -557,7 +575,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
-COMMON_LIBS-$(LIBMPEG2)           += libmpeg2/libmpeg2.a
 
 ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
@@ -579,7 +596,6 @@ PARTS = liba52 \
         libavcodec \
         libavformat \
         libavutil \
-        libmpeg2 \
         libpostproc \
         libswscale \
         mp3lib \
@@ -605,6 +621,7 @@ DIRS =  dvdread \
         libmpcodecs \
         libmpcodecs/native \
         libmpdemux \
+        libmpeg2 \
         libvo \
         osdep \
         stream \
diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile
deleted file mode 100644
index 4064251b50..0000000000
--- a/libmpeg2/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = libmpeg2.a
-
-SRCS_COMMON = alloc.c \
-	      cpu_accel.c\
-	      cpu_state.c \
-	      decode.c \
-	      header.c \
-	      idct.c \
-	      motion_comp.c \
-	      slice.c \
-
-SRCS_COMMON-$(HAVE_MMX)        += idct_mmx.c motion_comp_mmx.c
-SRCS_COMMON-$(HAVE_ALTIVEC)    += motion_comp_altivec.c idct_altivec.c
-SRCS_COMMON-$(HAVE_VIS)        += motion_comp_vis.c
-SRCS_COMMON-$(ARCH_ALPHA)      += idct_alpha.c motion_comp_alpha.c
-SRCS_COMMON-$(ARCH_ARMV4L)     += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
-
-include ../mpcommon.mak
-- 
cgit v1.2.3