From 48436708a695e0503fffc1fd0fcf8af70553785d Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 4 Jul 2008 13:02:12 +0000 Subject: Declare common netstream + vivodump dependencies in the common place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27186 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 511a73deeb..f45aa0c018 100644 --- a/Makefile +++ b/Makefile @@ -944,9 +944,9 @@ TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 mplayer-nomain.o: mplayer.c $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $< -TOOLS/netstream$(EXESUF): TOOLS/netstream.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) -TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) -TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): +TOOLS/netstream$(EXESUF): TOOLS/netstream.c +TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c +TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS) fastmemcpybench: TOOLS/fastmemcpybench.c -- cgit v1.2.3 From 90db8eb5f2672b333e2cefd174b7f6c17b8d235f Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 4 Jul 2008 13:42:19 +0000 Subject: Put common dependencies of mp3lib/test + mp3lib/test2 on a common line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27189 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f45aa0c018..69abd1deec 100644 --- a/Makefile +++ b/Makefile @@ -895,8 +895,9 @@ loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g loader/qtx/list$(EXESUF): loader/qtx/list.c $(LOADER_TEST_OBJS) loader/qtx/qtxload$(EXESUF): loader/qtx/qtxload.c $(LOADER_TEST_OBJS) -mp3lib/test$(EXESUF): mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) -mp3lib/test2$(EXESUF): mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) +mp3lib/test$(EXESUF): mp3lib/test.c +mp3lib/test2$(EXESUF): mp3lib/test2.c +mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) TESTS = codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ -- cgit v1.2.3 From 65a826f3482a04c37ec0cf0207fdff1c42409943 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 4 Jul 2008 14:22:54 +0000 Subject: Fix liba52/test linking, it needs -lm. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27191 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 69abd1deec..2b96be1163 100644 --- a/Makefile +++ b/Makefile @@ -885,7 +885,7 @@ codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $^ -liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) +liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm libvo/aspecttest$(EXESUF): libvo/aspecttest.c libvo/aspect.o libvo/geometry.o $(TEST_OBJS) -- cgit v1.2.3 From 2a8bfbaa94d17cd6fdd30aaf55f0afc735f07249 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 4 Jul 2008 14:33:03 +0000 Subject: Only build loader tests on x86. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27192 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2b96be1163..84224399df 100644 --- a/Makefile +++ b/Makefile @@ -901,9 +901,12 @@ mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(filter mp3lib/%,$(SRCS_COMMON:.c=. TESTS = codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ - loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) +ifdef ARCH_X86 +TESTS += loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) +endif + tests: $(TESTS) testsclean: -- cgit v1.2.3 From 3a9b304974d0a2952e8a0974404b00884c2720e9 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 4 Jul 2008 14:35:44 +0000 Subject: Simplify tool generation rules with a pattern rule. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27193 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 84224399df..8f9bd7a7bb 100644 --- a/Makefile +++ b/Makefile @@ -770,6 +770,8 @@ version.h: osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -I. $< $@ +%(EXESUF): %.c + ###### dependency declarations / specific CFLAGS ###### @@ -885,18 +887,15 @@ codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $^ -liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm +liba52/test$(EXESUF): cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm -libvo/aspecttest$(EXESUF): libvo/aspecttest.c libvo/aspect.o libvo/geometry.o $(TEST_OBJS) +libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o osdep/mmap_anon.o cpudetect.o $(TEST_OBJS) loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g -loader/qtx/list$(EXESUF): loader/qtx/list.c $(LOADER_TEST_OBJS) -loader/qtx/qtxload$(EXESUF): loader/qtx/qtxload.c $(LOADER_TEST_OBJS) +loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) -mp3lib/test$(EXESUF): mp3lib/test.c -mp3lib/test2$(EXESUF): mp3lib/test2.c mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) TESTS = codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ @@ -937,13 +936,13 @@ alltools: $(ALLTOOLS) toolsclean: rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 -TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image +TOOLS/bmovl-test$(EXESUF): -lSDL_image -TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ +TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o \ libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \ $(TEST_OBJS) -TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 +TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32 mplayer-nomain.o: mplayer.c $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $< -- cgit v1.2.3 From f3bf43f443e8c5435cb2467514ad1c5af19fd0bb Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 4 Jul 2008 20:14:00 +0000 Subject: Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8f9bd7a7bb..b8b92156f0 100644 --- a/Makefile +++ b/Makefile @@ -432,7 +432,7 @@ SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c SRCS_COMMON-$(STREAMING_LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ - stream/stream_livedotcom.c \ + stream/stream_live555.c \ SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ -- cgit v1.2.3