From caca5212961ac3be3a05e8e37a637b3a86a69f7e Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 10:44:59 +0000 Subject: Remove .S files from list of files to generate dependencies for. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26556 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3b35539b28..cde5354325 100644 --- a/Makefile +++ b/Makefile @@ -657,7 +657,7 @@ DEPS = foo include mpcommon.mak -DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))) +DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -- cgit v1.2.3 From df22d5fd5dde9d1f75f0ba41987e833996509ba6 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 11:22:25 +0000 Subject: Make OBJS depend on the recurse target instead of just the all target. This fixes 'make mplayer' and 'make mencoder'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cde5354325..f4937b0982 100644 --- a/Makefile +++ b/Makefile @@ -647,7 +647,7 @@ DIRS = dvdread \ TOOLS \ vidix \ -all: recurse $(ALL_PRG) +all: $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done @@ -671,6 +671,8 @@ endef $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) +$(OBJS): recurse + mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) -- cgit v1.2.3 From 558e30b12c85b2915c1f23801c51123ea3548808 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 13:28:36 +0000 Subject: Make sure all autogenerated .h and .c files exist in the vidix subdirectory before trying to create object or dependency files there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26571 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f4937b0982..df7bed1215 100644 --- a/Makefile +++ b/Makefile @@ -713,7 +713,10 @@ VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ $(VIDIX_PCI_FILES): vidix/pci.db LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) -vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES) +VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) +VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) + +$(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) @@ -900,6 +903,6 @@ TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) toolsclean: rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 --include $(DEPS) +#-include $(DEPS) .PHONY: all doxygen *install* recurse strip *tools -- cgit v1.2.3 From 928c5fb69dc3ae149d04a3791f27a8fba0edc6dd Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 13:31:00 +0000 Subject: Restore line mistakenly commented out in the last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26572 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index df7bed1215..6c3ca515eb 100644 --- a/Makefile +++ b/Makefile @@ -903,6 +903,6 @@ TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) toolsclean: rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 -#-include $(DEPS) +-include $(DEPS) .PHONY: all doxygen *install* recurse strip *tools -- cgit v1.2.3 From 238670ae7c29b74a8c92b360fe0f97d7e6f1b267 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 14:01:58 +0000 Subject: Merge loader/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6c3ca515eb..4200895539 100644 --- a/Makefile +++ b/Makefile @@ -404,6 +404,7 @@ SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c SRCS_COMMON-$(PVR) += stream/stream_pvr.c SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ libmpcodecs/vd_qtvideo.c +SRCS_COMMON-$(QTX_EMULATION) += loader/wrapper.S SRCS_COMMON-$(RADIO) += stream/stream_radio.c SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ @@ -439,6 +440,16 @@ SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c SRCS_COMMON-$(VCD) += stream/stream_vcd.c SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c +SRCS_COMMON-$(WIN32_EMULATION) += loader/elfdll.c \ + loader/ext.c \ + loader/ldt_keeper.c \ + loader/module.c \ + loader/pe_image.c \ + loader/pe_resource.c \ + loader/registry.c \ + loader/resource.c \ + loader/win32.c \ + SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/ad_dmo.c \ libmpcodecs/ad_dshow.c \ @@ -448,6 +459,23 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/vd_vfw.c \ libmpcodecs/vd_vfwex.c \ libmpdemux/demux_avs.c \ + loader/afl.c \ + loader/driver.c \ + loader/vfl.c \ + loader/dshow/DS_AudioDecoder.c \ + loader/dshow/DS_Filter.c \ + loader/dshow/DS_VideoDecoder.c \ + loader/dshow/allocator.c \ + loader/dshow/cmediasample.c \ + loader/dshow/guids.c \ + loader/dshow/inputpin.c \ + loader/dshow/mediatype.c \ + loader/dshow/outputpin.c \ + loader/dmo/DMO_AudioDecoder.c \ + loader/dmo/DMO_VideoDecoder.c \ + loader/dmo/buffer.c \ + loader/dmo/dmo.c \ + loader/dmo/dmo_guids.c \ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c @@ -589,7 +617,6 @@ COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a -COMMON_LIBS-$(WIN32DLL) += loader/loader.a ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -613,10 +640,6 @@ PARTS = libavcodec \ libpostproc \ libswscale \ -ifeq ($(WIN32DLL),yes) -PARTS += loader -endif - DIRS = dvdread \ gui \ gui/mplayer \ @@ -637,6 +660,9 @@ DIRS = dvdread \ libmpdemux \ libmpeg2 \ libvo \ + loader \ + loader/dshow \ + loader/dmo \ mp3lib \ osdep \ stream \ @@ -705,6 +731,10 @@ libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec +loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) +#loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT +loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN) + mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ @@ -720,6 +750,12 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) +LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o cpudetect.o mp_msg.o mp_fifo.o osdep/mmap_anon.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm + +loader/qtx/list loader/qtx/qtxload: CFLAGS += -g +loader/qtx/list: loader/qtx/list.c $(LOADER_TEST_OBJS) +loader/qtx/qtxload: loader/qtx/qtxload.c $(LOADER_TEST_OBJS) + mp3lib/test: mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm mp3lib/test2: mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm -- cgit v1.2.3 From d5dfadb69788decafb85e107a61ed3a6cd611cc5 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 15:20:15 +0000 Subject: Remove unnecessary CFLAGS hack. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26578 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4200895539..1412bbff6f 100644 --- a/Makefile +++ b/Makefile @@ -688,8 +688,6 @@ $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -CFLAGS := $(subst -I..,-I.,$(CFLAGS)) - define RECURSIVE_RULE $(part)/$(part).a: $(MAKE) -C $(part) -- cgit v1.2.3 From 17e278294aea7c98afe5f106c4902bd33ca9d139 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 15:36:00 +0000 Subject: Run 'make depend', not 'make .depend' in FFmpeg subdirectories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26579 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1412bbff6f..e922cb7f0b 100644 --- a/Makefile +++ b/Makefile @@ -686,7 +686,7 @@ include mpcommon.mak DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) - for part in $(PARTS); do $(MAKE) -C $$part .depend; done + for part in $(PARTS); do $(MAKE) -C $$part depend; done define RECURSIVE_RULE $(part)/$(part).a: -- cgit v1.2.3 From d4f42c4d4629ba19c1f308ebb72fb92680668504 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 15:42:36 +0000 Subject: Remove code for .depend generation, inclusion and related hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e922cb7f0b..d9883805dc 100644 --- a/Makefile +++ b/Makefile @@ -678,9 +678,6 @@ all: $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done -# Hack to keep .depend from being generated at the top level unnecessarily. -DEPS = foo - include mpcommon.mak DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) -- cgit v1.2.3 From 75e96820c46addeba6accc4501ff47c40977db3f Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 17:54:14 +0000 Subject: Merge now redundant clean and distclean rules into the top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d9883805dc..ff65e8408d 100644 --- a/Makefile +++ b/Makefile @@ -640,7 +640,8 @@ PARTS = libavcodec \ libpostproc \ libswscale \ -DIRS = dvdread \ +DIRS = . \ + dvdread \ gui \ gui/mplayer \ gui/mplayer/gtk \ @@ -810,14 +811,14 @@ uninstall: fi ; \ done -clean:: toolsclean +clean: toolsclean -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) for part in $(PARTS); do $(MAKE) -C $$part clean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) -distclean:: doxygen_clean +distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done -rm -f configure.log config.mak config.h rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) -- cgit v1.2.3 From 2c5869a10ba154af8b8ab3d9be868d44a5c2cfa0 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 18:12:07 +0000 Subject: Remove '-' prefix from 'rm -f' commands for consistency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26585 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ff65e8408d..f4058b25dc 100644 --- a/Makefile +++ b/Makefile @@ -812,7 +812,7 @@ uninstall: done clean: toolsclean - -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ + rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) for part in $(PARTS); do $(MAKE) -C $$part clean; done @@ -820,7 +820,7 @@ clean: toolsclean distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done - -rm -f configure.log config.mak config.h + rm -f configure.log config.mak config.h rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) strip: -- cgit v1.2.3 From 71272215d48cd57488653156f47b94aa759fa531 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 18:12:45 +0000 Subject: cosmetics: Reorder commands in (dist)clean targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26586 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f4058b25dc..a201696ab7 100644 --- a/Makefile +++ b/Makefile @@ -812,16 +812,16 @@ uninstall: done clean: toolsclean + for part in $(PARTS); do $(MAKE) -C $$part clean; done + rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) - for part in $(PARTS); do $(MAKE) -C $$part clean; done - rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done - rm -f configure.log config.mak config.h rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) + rm -f configure.log config.mak config.h strip: strip -s $(ALL_PRG) -- cgit v1.2.3 From 7398abf3899f953eda95d925df6bcc64b08461ed Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Apr 2008 18:34:59 +0000 Subject: Get rid of now obsolete library rules and variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a201696ab7..d4bd42177b 100644 --- a/Makefile +++ b/Makefile @@ -622,12 +622,11 @@ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) COMMON_LIBS += $(COMMON_LIBS-yes) -LIBS_MPLAYER += $(LIBS_MPLAYER-yes) OBJS_MPLAYER += $(OBJS_MPLAYER-yes) ALL_PRG += $(ALL_PRG-yes) -MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS) -MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS) +MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) +MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man -- cgit v1.2.3