From b63817b21557652d60707bc4e1ebb4111f4ec880 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 1 Mar 2009 10:52:26 +0000 Subject: Fix dependencies on generated header files for the codec* binaries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28768 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 449b0589e3..ef4b7e6849 100644 --- a/Makefile +++ b/Makefile @@ -823,7 +823,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS) mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) -codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h +codec-cfg$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf @@ -960,10 +960,10 @@ tags: TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) +codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $^ -codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) +codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS) $(CC) -I. -DCODECS2HTML -o $@ $^ liba52/test$(EXESUF): cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm -- cgit v1.2.3 From 48d2eb7209bbb1aa173732584cd5b2c08b297ab1 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 1 Mar 2009 10:53:37 +0000 Subject: Add explicit dependencies on generated header files for the object files along with the dependency information files. This fixes a straight build without generating dependency information. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28769 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ef4b7e6849..5b7ad347b8 100644 --- a/Makefile +++ b/Makefile @@ -851,8 +851,9 @@ version.h: version.sh ###### dependency declarations / specific CFLAGS ###### -codec-cfg.d: codecs.conf.h +codec-cfg.d codec-cfg.o: codecs.conf.h mpcommon.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h +mpcommon.o vobsub.o gui/win32/gui.o libmpdemux/muxer_avi.o stream/network.o stream/stream_cddb.o: version.h $(DEPS): help_mp.h libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) -- cgit v1.2.3 From 3c3495a1227408c2523242911fd6c8282afbe94c Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 1 Mar 2009 11:03:18 +0000 Subject: Make all object files depend on generated header files. This solution does not record precise dependencies but is robust against header dependency changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28770 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5b7ad347b8..b60c99eaac 100644 --- a/Makefile +++ b/Makefile @@ -851,10 +851,8 @@ version.h: version.sh ###### dependency declarations / specific CFLAGS ###### -codec-cfg.d codec-cfg.o: codecs.conf.h -mpcommon.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h -mpcommon.o vobsub.o gui/win32/gui.o libmpdemux/muxer_avi.o stream/network.o stream/stream_cddb.o: version.h -$(DEPS): help_mp.h +# Make sure all generated header files are created. +$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" -- cgit v1.2.3 From e96ebebaf0fd002a62f9b4ed3d6d780a2c6bf6e2 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 1 Mar 2009 11:07:05 +0000 Subject: codec-cfg does not depend on codecs.conf.h, it is used to generate it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28771 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b60c99eaac..7678adb721 100644 --- a/Makefile +++ b/Makefile @@ -823,7 +823,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS) mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) -codec-cfg$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h +codec-cfg$(EXESUF): codec-cfg.c help_mp.h $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf -- cgit v1.2.3 From c003bcdcabbae1f799ad7c6309e9a09b1e8c02c7 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 1 Mar 2009 11:22:31 +0000 Subject: Fix 10l typo in ADD_ALL_EXESUFS function name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28772 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7678adb721..00bfbb06dd 100644 --- a/Makefile +++ b/Makefile @@ -1000,7 +1000,7 @@ tools: $(addsuffix $(EXESUF),$(TOOLS)) alltools: $(addsuffix $(EXESUF),$(ALLTOOLS)) toolsclean: - -rm -f $(foreach file,$(ALLTOOLS),$(call ADD_ALL_EXESUFSx,$(file))) + -rm -f $(foreach file,$(ALLTOOLS),$(call ADD_ALL_EXESUFS,$(file))) -rm -f TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 TOOLS/bmovl-test$(EXESUF): -lSDL_image -- cgit v1.2.3 From 23599b030c87c64c5c4cdb0e9a96338ef230a18b Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 1 Mar 2009 11:36:39 +0000 Subject: DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 00bfbb06dd..a7461a00b3 100644 --- a/Makefile +++ b/Makefile @@ -546,6 +546,7 @@ SRCS_MPLAYER-$(BL) += libvo/vo_bl.c SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_macosx.c SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_macosx.m +SRCS_MPLAYER-$(DART) += libao2/ao_dart.c SRCS_MPLAYER-$(DFBMGA) += libvo/vo_dfbmga.c SRCS_MPLAYER-$(DGA) += libvo/vo_dga.c SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c -- cgit v1.2.3 From 95dac90527e8761af4e959dc08cfcccda8ae6303 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 5 Mar 2009 20:25:54 +0000 Subject: Simplify some vidix dhahelper build commands with automatic make variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28815 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a7461a00b3..e5601b189d 100644 --- a/Makefile +++ b/Makefile @@ -1098,18 +1098,17 @@ vidix/dhahelperwin/dhahelper-rc.o: vidix/dhahelperwin/common.ver vidix/dhahelper vidix/dhahelperwin/base.tmp: vidix/dhahelperwin/dhahelper.o vidix/dhahelperwin/dhahelper-rc.o $(CC) -Wl,--base-file,$@ -Wl,--entry,_DriverEntry@8 -nostartfiles \ - -nostdlib -o vidix/dhahelperwin/junk.tmp $^ -lntoskrnl - -rm -f vidix/dhahelperwin/junk.tmp + -nostdlib -o $(@D)/junk.tmp $^ -lntoskrnl + -rm -f $(@D)/junk.tmp vidix/dhahelperwin/temp.exp: vidix/dhahelperwin/base.tmp - dlltool --dllname vidix/dhahelperwin/dhahelper.sys --base-file $< --output-exp $@ + dlltool --dllname $(@D)/dhahelper.sys --base-file $< --output-exp $@ vidix/dhahelperwin/dhahelper.sys: vidix/dhahelperwin/temp.exp vidix/dhahelperwin/dhahelper.o vidix/dhahelperwin/dhahelper-rc.o $(CC) -Wl,--subsystem,native -Wl,--image-base,0x10000 \ -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 \ -Wl,--entry,_DriverEntry@8 -Wl,$< -mdll -nostartfiles -nostdlib \ - -o $@ vidix/dhahelperwin/dhahelper.o \ - vidix/dhahelperwin/dhahelper-rc.o -lntoskrnl + -o $@ $(@:.sys=.o) $(@:.sys=-rc.o) -lntoskrnl strip $@ install-dhahelperwin: -- cgit v1.2.3 From 3e40788623311c9b917116a80eb3c9f3d0d9c03c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 5 Mar 2009 21:27:05 +0000 Subject: Simplify CFLAGS generation for individual targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28827 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e5601b189d..69fffcc711 100644 --- a/Makefile +++ b/Makefile @@ -855,18 +855,18 @@ version.h: version.sh # Make sure all generated header files are created. $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h -libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) -libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" -libdvdread4/%.o libdvdread4/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) -libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) +libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) +libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" +libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) +libfaad2/%: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) -loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) -#loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT -loader/win32.o loader/win32.d: CFLAGS += $(CFLAGS_STACKREALIGN) +loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) +#loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT +loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) -mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer +mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer -tremor/%.o tremor/%.d: CFLAGS += $(CFLAGS_TREMOR_LOW) +tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW) vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER) -- cgit v1.2.3 From 1005952a8ba43138089d130e74b40f22908911f3 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 5 Mar 2009 22:19:47 +0000 Subject: Only add -Ilibdvdnav to the CFLAGS of the files that require it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 69fffcc711..f3a78b2de3 100644 --- a/Makefile +++ b/Makefile @@ -857,6 +857,7 @@ $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" +libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV) libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) libfaad2/%: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) -- cgit v1.2.3