[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[49] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[49] mplayerxp
|
From: <nic...@us...> - 2009-12-18 19:05:43
|
Revision: 49
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=49&view=rev
Author: nickols_k
Date: 2009-12-18 19:05:35 +0000 (Fri, 18 Dec 2009)
Log Message:
-----------
simplify makefile system
Modified Paths:
--------------
mplayerxp/Makefile
mplayerxp/configure
mplayerxp/libmpcodecs/Makefile
mplayerxp/libmpcodecs/libnuppelvideo/Makefile
mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.c
mplayerxp/libmpdemux/Makefile
mplayerxp/libmpdemux/freesdp/Makefile
mplayerxp/libmpdemux/librtsp/Makefile
mplayerxp/libmpdemux/realrtsp/Makefile
mplayerxp/postproc/Makefile
mplayerxp/postproc/libmenu/Makefile
Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -29,21 +29,14 @@
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
-MP_LIBS = libmpdemux/libmpdemux.a
-ifeq ($(HAVE_CSS),yes)
-MP_LIBS += libmpdemux/librtsp/librtsp.a \
- libmpdemux/realrtsp/librealrtsp.a \
- libmpdemux/freesdp/libfreesdp.a
-endif
-MP_LIBS += libmpcodecs/libmpcodecs.a \
- libmpcodecs/libnuppelvideo/libnuppelvideo.a \
- libao2/libao2.a \
- postproc/libpostproc.a \
- postproc/libmenu/libmenu.a \
- input/libinput.a \
- libvo/libvo.a \
- osdep/libosdep.a \
- nls/libnls.a
+MP_LIBS = libmpdemux/libmpdemux.a \
+ libmpcodecs/libmpcodecs.a \
+ libao2/libao2.a \
+ postproc/libpostproc.a \
+ input/libinput.a \
+ libvo/libvo.a \
+ osdep/libosdep.a \
+ nls/libnls.a
COMMON_LIBS = $(MP_LIBS) $(EXTRALIBS) -lm
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Ilibvo $(EXTRA_INC)
Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/configure 2009-12-18 19:05:35 UTC (rev 49)
@@ -257,6 +257,7 @@
pkg_config=pkg-config
debug=
language=
+prefix="/usr/local"
for ac_option do
optval="${ac_option#*=}"
case "$ac_option" in
Modified: mplayerxp/libmpcodecs/Makefile
===================================================================
--- mplayerxp/libmpcodecs/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/libmpcodecs/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -1,10 +1,9 @@
include ../mp_config.mak
-DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit; done
-
LIBNAME = libmpcodecs.a
-
SUBDIRS = libnuppelvideo
+DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit; done
+DO_ALL = @ for i in $(SUBDIRS); do $(MAKE) -C $$i all || exit; done
SRCS=dec_video.c vd.c vd_null.c vd_ffmpeg.c vd_divx4.c vd_raw.c vd_nuv.c vd_libmpeg2.c vd_dshow.c vd_vfw.c vd_xvid.c vd_xanim.c vd_mpegpes.c vd_huffyuv.c vd_real.c vd_dmo.c vd_qtvideo.c vd_theora.c
SRCS+=ad.c dec_audio.c ad_null.c ad_ffmp3.c ad_mp3.c ad_a52.c ad_dca.c ad_hwac3.c ad_pcm.c ad_dvdpcm.c ad_dshow.c ad_acm.c ad_vorbis.c ad_real.c ad_dmo.c ad_qtaudio.c ad_faad.c ad_twin.c
@@ -16,17 +15,20 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+.PHONY: $(SUBDIRS)
+all: $(LIBNAME)
+
+$(SUBDIRS):
+ $(DO_ALL)
-all: $(LIBNAME) $(SUBDIRS)
- $(DO_MAKE)
-
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-$(LIBNAME): $(OBJS)
- $(AR) r $(LIBNAME) $(OBJS)
+$(LIBNAME): $(SUBDIRS) $(OBJS)
+ $(AR) r $(LIBNAME) $(OBJS) \
+ $(wildcard libnuppelvideo/*.o)
+
clean:
$(DO_MAKE)
Modified: mplayerxp/libmpcodecs/libnuppelvideo/Makefile
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/libmpcodecs/libnuppelvideo/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -1,7 +1,5 @@
include ../../mp_config.mak
-LIBNAME = libnuppelvideo.a
-
SRCS = RTjpegN.c \
minilzo.c \
nuppelvideo.c
@@ -12,17 +10,11 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+all: $(OBJS)
-all: $(LIBNAME)
-
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-$(LIBNAME): $(OBJS)
- $(AR) r $(LIBNAME) $(OBJS)
-
-
clean:
rm -f *.o *.a *~
Modified: mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.c
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.c 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.c 2009-12-18 19:05:35 UTC (rev 49)
@@ -78,9 +78,9 @@
static unsigned char RTjpeg_lb8;
static unsigned char RTjpeg_cb8;
-static int RTjpeg_width, RTjpeg_height;
-static int RTjpeg_Ywidth, RTjpeg_Cwidth;
-static int RTjpeg_Ysize, RTjpeg_Csize;
+static unsigned RTjpeg_width, RTjpeg_height;
+static unsigned RTjpeg_Ywidth, RTjpeg_Cwidth;
+static unsigned RTjpeg_Ysize, RTjpeg_Csize;
static __s16 *RTjpeg_old=NULL;
@@ -2779,7 +2779,7 @@
void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q)
{
- int i;
+ unsigned i;
__u64 qual;
RTjpeg_init_data();
@@ -2823,7 +2823,7 @@
void RTjpeg_init_decompress(__u32 *buf, int width, int height)
{
- int i;
+ unsigned i;
RTjpeg_init_data();
@@ -2855,10 +2855,11 @@
int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp)
{
__s8 * sb;
- register __s8 * bp1 = bp + (RTjpeg_width<<3);
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
- register int i, j, k;
+ register __u8 * bp1 = bp + (RTjpeg_width<<3);
+ register __u8 * bp2 = bp + RTjpeg_Ysize;
+ register __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ register int i;
+ register unsigned j, k;
#ifdef MMX
emms();
@@ -2909,9 +2910,10 @@
int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp)
{
__s8 * sb;
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + RTjpeg_Csize;
- register int i, j, k;
+ register __u8 * bp2 = bp + RTjpeg_Ysize;
+ register __u8 * bp3 = bp2 + RTjpeg_Csize;
+ register int i;
+ register unsigned j, k;
#ifdef MMX
emms();
@@ -2953,7 +2955,7 @@
int RTjpeg_compress8(__s8 *sp, unsigned char *bp)
{
__s8 * sb;
- int i, j;
+ unsigned i, j;
#ifdef MMX
emms();
@@ -2980,9 +2982,10 @@
void RTjpeg_decompressYUV422(__s8 *sp, __u8 *bp)
{
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize);
- int i, j,k;
+ register __u8 * bp2 = bp + RTjpeg_Ysize;
+ register __u8 * bp3 = bp2 + (RTjpeg_Csize);
+ int i;
+ unsigned j,k;
#ifdef MMX
emms();
@@ -3028,10 +3031,11 @@
void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp)
{
- register __s8 * bp1 = bp + (RTjpeg_width<<3);
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
- int i, j,k;
+ register __u8 * bp1 = bp + (RTjpeg_width<<3);
+ register __u8 * bp2 = bp + RTjpeg_Ysize;
+ register __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ int i;
+ unsigned j,k;
#ifdef MMX
emms();
@@ -3090,7 +3094,7 @@
void RTjpeg_decompress8(__s8 *sp, __u8 *bp)
{
- int i, j;
+ unsigned i, j;
#ifdef MMX
emms();
@@ -3209,10 +3213,11 @@
{
__s8 * sb;
//rh __s16 *block;
- register __s8 * bp1 = bp + (RTjpeg_width<<3);
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
- register int i, j, k;
+ register __u8 * bp1 = bp + (RTjpeg_width<<3);
+ register __u8 * bp2 = bp + RTjpeg_Ysize;
+ register __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ register int i;
+ unsigned j, k;
#ifdef MMX
emms();
@@ -3301,9 +3306,10 @@
{
__s8 * sb;
__s16 *block;
- register __s8 * bp2;
- register __s8 * bp3;
- register int i, j, k;
+ register __u8 * bp2;
+ register __u8 * bp3;
+ register int i;
+ unsigned j, k;
#ifdef MMX
emms();
@@ -3366,7 +3372,7 @@
bp2+=RTjpeg_width<<2;
bp3+=RTjpeg_width<<2;
}
- printf ("%d\n", block - RTjpeg_old);
+ printf ("%ld\n", block - RTjpeg_old);
#ifdef MMX
emms();
#endif
@@ -3377,7 +3383,7 @@
{
__s8 * sb;
__s16 *block;
- int i, j;
+ unsigned i, j;
#ifdef MMX
emms();
@@ -3424,7 +3430,7 @@
void RTjpeg_yuv422rgb(__u8 *buf, __u8 *rgb, int stride)
{
int tmp;
- int i, j;
+ unsigned i, j;
__s32 y, crR, crG, cbG, cbB;
__u8 *bufcr, *bufcb, *bufy, *bufoute;
int yskip;
@@ -3472,7 +3478,7 @@
void RTjpeg_yuv420rgb(__u8 *buf, __u8 *rgb, int stride)
{
int tmp;
- int i, j;
+ unsigned i, j;
__s32 y, crR, crG, cbG, cbB;
__u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
@@ -3546,7 +3552,7 @@
void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb, int stride)
{
int tmp;
- int i, j;
+ unsigned i, j;
__s32 y, crR, crG, cbG, cbB;
__u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
@@ -3622,7 +3628,7 @@
void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb, int stride)
{
int tmp;
- int i, j;
+ unsigned i, j;
__s32 y, crR, crG, cbG, cbB;
__u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
@@ -3695,7 +3701,7 @@
void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb, int stride)
{
int tmp;
- int i, j;
+ unsigned i, j;
__s32 y, crR, crG, cbG, cbB;
__u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
Modified: mplayerxp/libmpdemux/Makefile
===================================================================
--- mplayerxp/libmpdemux/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/libmpdemux/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -4,6 +4,7 @@
include ../mp_config.mak
DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit; done
+DO_ALL = @ for i in $(SUBDIRS); do $(MAKE) -C $$i all || exit; done
SRCS = s_file.c s_ffmpeg.c
ifeq ($(HAVE_CDDA),yes)
@@ -50,16 +51,24 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+.PHONY: $(SUBDIRS)
-all: $(LIBNAME) $(SUBDIRS)
- $(DO_MAKE)
+all: $(LIBNAME)
+$(SUBDIRS):
+ $(DO_ALL)
+
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-$(LIBNAME): $(OBJS)
+$(LIBNAME): $(SUBDIRS) $(OBJS)
$(AR) r $(LIBNAME) $(OBJS)
+ifeq ($(HAVE_STREAMING),yes)
+ $(AR) r $(LIBNAME) \
+ $(wildcard freesdp/*.o) \
+ $(wildcard librtsp/*.o) \
+ $(wildcard realrtsp/*.o)
+endif
test: $(LIBNAME) test.c
$(CC) $(CFLAGS) test.c ../mp_msg.c ../linux/shmem.c -o test -L. -lmpdemux -ldvdread -lz -lpthread
Modified: mplayerxp/libmpdemux/freesdp/Makefile
===================================================================
--- mplayerxp/libmpdemux/freesdp/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/libmpdemux/freesdp/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -1,7 +1,5 @@
include ../../mp_config.mak
-LIBNAME = libfreesdp.a
-
SRCS = common.c \
errorlist.c \
parser.c
@@ -11,17 +9,11 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+all: $(OBJS)
-all: $(LIBNAME)
-
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-$(LIBNAME): $(OBJS)
- $(AR) r $(LIBNAME) $(OBJS)
-
-
clean:
rm -f *.o *.a *~
Modified: mplayerxp/libmpdemux/librtsp/Makefile
===================================================================
--- mplayerxp/libmpdemux/librtsp/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/libmpdemux/librtsp/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -1,7 +1,5 @@
include ../../mp_config.mak
-LIBNAME = librtsp.a
-
SRCS = rtsp.c \
rtsp_rtp.c \
rtsp_session.c
@@ -11,17 +9,11 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+all: $(OBJS)
-all: $(LIBNAME)
-
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-$(LIBNAME): $(OBJS)
- $(AR) r $(LIBNAME) $(OBJS)
-
-
clean:
rm -f *.o *.a *~
Modified: mplayerxp/libmpdemux/realrtsp/Makefile
===================================================================
--- mplayerxp/libmpdemux/realrtsp/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/libmpdemux/realrtsp/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -14,17 +14,11 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+all: $(OBJS)
-all: $(LIBNAME)
-
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-$(LIBNAME): $(OBJS)
- $(AR) r $(LIBNAME) $(OBJS)
-
-
clean:
rm -f *.o *.a *~
Modified: mplayerxp/postproc/Makefile
===================================================================
--- mplayerxp/postproc/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/postproc/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -2,9 +2,9 @@
include ../mp_config.mak
LIBNAME = libpostproc.a
-
-SUBDIRS=libmenu
+SUBDIRS = libmenu
DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit; done
+DO_ALL = @ for i in $(SUBDIRS); do $(MAKE) -C $$i all || exit; done
SRCS=postprocess.c swscale.c
SRCS+=af.c af_ao2.c af_crystality.c af_mp.c af_dummy.c af_delay.c af_channels.c af_format.c af_resample.c af_volume.c af_equalizer.c af_tools.c af_comp.c af_gate.c af_pan.c af_surround.c af_sub.c af_export.c af_volnorm.c af_extrastereo.c af_lp.c af_dyn.c af_echo3d.c af_hrtf.c af_ffenc.c af_raw.c af_karaoke.c af_center.c af_sinesuppress.c af_scaletempo.c
@@ -15,19 +15,20 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+.PHONY: $(SUBDIRS)
-all: $(LIBNAME) $(SUBDIRS)
- $(DO_MAKE)
+all: $(LIBNAME)
+$(SUBDIRS):
+ $(DO_ALL)
+
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
+$(LIBNAME): $(SUBDIRS) $(OBJS)
+ $(AR) r $(LIBNAME) $(OBJS) \
+ $(wildcard libmenu/*.o)
-$(LIBNAME): $(OBJS)
- $(AR) r $(LIBNAME) $(OBJS)
-
-
clean:
$(DO_MAKE)
rm -f *.o *.a *~
Modified: mplayerxp/postproc/libmenu/Makefile
===================================================================
--- mplayerxp/postproc/libmenu/Makefile 2009-12-17 18:44:54 UTC (rev 48)
+++ mplayerxp/postproc/libmenu/Makefile 2009-12-18 19:05:35 UTC (rev 49)
@@ -1,7 +1,5 @@
include ../../mp_config.mak
-LIBNAME = libmenu.a
-
SRCS = menu.c \
menu_cmdlist.c \
menu_pt.c \
@@ -16,17 +14,11 @@
.SUFFIXES: .c .o
-# .PHONY: all clean
+all: $(OBJS)
-all: $(LIBNAME)
-
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-$(LIBNAME): $(OBJS)
- $(AR) r $(LIBNAME) $(OBJS)
-
-
clean:
rm -f *.o *.a *~
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
