From ed5f632ca1da5e90981d8b44068a622f797e8ef6 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 21:22:13 +0000 Subject: Remove useless output. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26696 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9dc7d52cde..6bf6955f4d 100644 --- a/Makefile +++ b/Makefile @@ -736,7 +736,6 @@ endif @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h ifneq ($(HELP_FILE),help/help_mp-en.h) - @echo "Adding untranslated messages to help_mp.h" @echo '// untranslated messages from the English master file:' >> help_mp.h @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h endif -- cgit v1.2.3 From f6318795defbcdc06d65343c7a8478b8ef6906f9 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 12:39:04 +0000 Subject: FFmpeg parts no longer require extra -I CFLAGS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26704 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6bf6955f4d..0783f866d9 100644 --- a/Makefile +++ b/Makefile @@ -772,8 +772,6 @@ dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDR libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" 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) -- cgit v1.2.3 From 82b8b8dbe7202b22026cec6081769525c1d2cf03 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 17:47:19 +0000 Subject: cosmetics: Move some stuff around for more logical grouping. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26707 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 142 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0783f866d9..b35e4ded37 100644 --- a/Makefile +++ b/Makefile @@ -638,12 +638,6 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) -PARTS = libavcodec \ - libavformat \ - libavutil \ - libpostproc \ - libswscale \ - DIRS = . \ dvdread \ gui \ @@ -691,6 +685,12 @@ DIRS = . \ TOOLS \ vidix \ +PARTS = libavcodec \ + libavformat \ + libavutil \ + libpostproc \ + libswscale \ + all: $(ALL_PRG) %.d: %.c @@ -702,44 +702,18 @@ all: $(ALL_PRG) %.d: %.m $(MPDEPEND_CMD) > $@ -%.ho: %.h - $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< - %.o: %.m $(CC) $(CFLAGS) -c -o $@ $< -codec-cfg.d: codecs.conf.h -mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h -DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) -$(DEPS): help_mp.h +%.ho: %.h + $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< + +ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) +checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done -# rebuild version.h each time the working copy is updated -ifeq ($(wildcard .svn/entries),.svn/entries) -version.h: .svn/entries -endif -version.h: - ./version.sh `$(CC) -dumpversion` - -help_mp.h: help/help_mp-en.h $(HELP_FILE) - @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h - @echo '// See the help/ subdir for the editable files.' >> help_mp.h - @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h - @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h -ifeq ($(CHARSET),) - @echo '#include "$(HELP_FILE)"' >> help_mp.h -else - iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h -endif - @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h - -ifneq ($(HELP_FILE),help/help_mp-en.h) - @echo '// untranslated messages from the English master file:' >> help_mp.h - @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h -endif - define RECURSIVE_RULE $(part)/$(part).a: recurse $(MAKE) -C $(part) @@ -768,6 +742,41 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +# ./configure must be rerun if it changed +config.mak: configure + @echo "############################################################" + @echo "####### Please run ./configure again - it's changed! #######" + @echo "############################################################" + +# rebuild version.h each time the working copy is updated +ifeq ($(wildcard .svn/entries),.svn/entries) +version.h: .svn/entries +endif +version.h: + ./version.sh `$(CC) -dumpversion` + +help_mp.h: help/help_mp-en.h $(HELP_FILE) + @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h + @echo '// See the help/ subdir for the editable files.' >> help_mp.h + @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h + @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h +ifeq ($(CHARSET),) + @echo '#include "$(HELP_FILE)"' >> help_mp.h +else + iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h +endif + @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h + +ifneq ($(HELP_FILE),help/help_mp-en.h) + @echo '// untranslated messages from the English master file:' >> help_mp.h + @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h +endif + +codec-cfg.d: codecs.conf.h +mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h +DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) +$(DEPS): help_mp.h + dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS) libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE @@ -789,29 +798,6 @@ VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) -TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm - -liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) - -libvo/aspecttest$(EXESUF): libvo/aspecttest.c 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) - -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) - -TESTS = liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ - loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ - mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) - -tests: $(TESTS) - -testsclean: - rm -f $(TESTS) install: install-dirs $(INSTALL_TARGETS) @@ -880,6 +866,11 @@ distclean: clean doxygen_clean testsclean toolsclean codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ cpuinfo$(EXESUF) TAGS tags +doxygen: + doxygen DOCS/tech/Doxyfile + +doxygen_clean: + -rm -rf DOCS/tech/doxygen strip: strip -s $(ALL_PRG) @@ -889,21 +880,30 @@ TAGS: tags: rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a -ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) -checkheaders: $(ALLHEADERS:.h=.ho) -# ./configure must be rerun if it changed -config.mak: configure - @echo "############################################################" - @echo "####### Please run ./configure again - it's changed! #######" - @echo "############################################################" +TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -doxygen: - doxygen DOCS/tech/Doxyfile +liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -doxygen_clean: - -rm -rf DOCS/tech/doxygen +libvo/aspecttest$(EXESUF): libvo/aspecttest.c 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) + +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) + +TESTS = liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ + mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) + +tests: $(TESTS) + +testsclean: + rm -f $(TESTS) TOOLS = TOOLS/alaw-gen$(EXESUF) \ TOOLS/asfinfo$(EXESUF) \ -- cgit v1.2.3 From f7924f3fdd1ab3c9092f6742b86f64196929ca93 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 17:51:44 +0000 Subject: Add some comment headings to divide the Makefile into logical chapters. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26708 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b35e4ded37..62175bf195 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ include config.mak + +###### variable declarations ####### + COMMON_LDFLAGS += $(EXTRA_LIB)\ $(EXTRALIBS) \ @@ -691,6 +694,10 @@ PARTS = libavcodec \ libpostproc \ libswscale \ + + +###### generic rules ####### + all: $(ALL_PRG) %.d: %.c @@ -772,6 +779,10 @@ ifneq ($(HELP_FILE),help/help_mp-en.h) @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h endif + + +###### dependency declarations / specific CFLAGS ###### + codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) @@ -799,6 +810,9 @@ VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) + +###### installation rules ####### + install: install-dirs $(INSTALL_TARGETS) install-dirs: @@ -881,6 +895,9 @@ tags: rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a + +###### tests / tools ####### + TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -- cgit v1.2.3 From f85e3daca56cdc436c0470ff485e7e2907a76938 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 10 May 2008 12:38:35 +0000 Subject: Add . to windres include path (otherwise version.h is not found). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26714 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 62175bf195..5184664aa9 100644 --- a/Makefile +++ b/Makefile @@ -747,7 +747,7 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o $(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@ osdep/mplayer-rc.o: osdep/mplayer.rc version.h - $(WINDRES) -o $@ $< + $(WINDRES) -I. -o $@ $< # ./configure must be rerun if it changed config.mak: configure -- cgit v1.2.3 From 57a3542801f005eac35ea671d3c6356380323dc1 Mon Sep 17 00:00:00 2001 From: michael Date: Sat, 10 May 2008 18:54:10 +0000 Subject: AVOptions support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26723 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5184664aa9..fd2c48ecef 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,8 @@ SRCS_COMMON-$(LIBASS) += libass/ass.c \ libass/ass_utils.c \ libmpcodecs/vf_ass.c \ -SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c \ +SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ + libaf/af_lavcresample.c \ libmpcodecs/ad_ffmpeg.c \ libmpcodecs/vd_ffmpeg.c \ libmpcodecs/vf_lavc.c \ -- cgit v1.2.3 From 08d224b68dd38808434c630fb100ddb1109ddf2d Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 11 May 2008 14:25:47 +0000 Subject: Remove unused file, it has never been compiled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26740 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fd2c48ecef..d5a11d9a47 100644 --- a/Makefile +++ b/Makefile @@ -288,7 +288,6 @@ SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ libdvdcss/error.c \ libdvdcss/ioctl.c \ libdvdcss/libdvdcss.c \ - #libdvdcss/bsdi_ioctl \ SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \ libfaad2/cfft.c \ -- cgit v1.2.3 From 5c5c0bce57ebc98795e5c97fa09e4c3b2b0a755b Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 13 May 2008 07:58:41 +0000 Subject: Fix typo in install-gui target dependency. patch by andrew, andrew.david.45 gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26754 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d5a11d9a47..bb0c236daf 100644 --- a/Makefile +++ b/Makefile @@ -638,7 +638,7 @@ ALL_PRG += $(ALL_PRG-yes) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man -INSTALL_TARGETS-$(GUI) += install-gui +INSTALL_TARGETS-$(GUI_GTK) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) DIRS = . \ -- cgit v1.2.3