From 76c0f7b271cc54e219b188ccec33fef9e5501e3a Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 15 May 2009 22:24:12 +0000 Subject: Simplify find invocation in tags/TAGS generation command: - Drop '-print', which is the default for find. - Drop unnecessary invocation of find in a subshell. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29309 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f308abc086..ec957df3c2 100644 --- a/Makefile +++ b/Makefile @@ -982,10 +982,10 @@ doxygen: doxygen DOCS/tech/Doxyfile TAGS: - rm -f $@; ( find -name '*.[chS]' -o -name '*.asm' -print ) | xargs etags -a + rm -f $@; find -name '*.[chS]' -o -name '*.asm' | xargs etags -a tags: - rm -f $@; ( find -name '*.[chS]' -o -name '*.asm' -print ) | xargs ctags -a + rm -f $@; find -name '*.[chS]' -o -name '*.asm' | xargs ctags -a -- cgit v1.2.3 From 83058ab95bc1eab72235a10c5fa4125b51929d5e Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 15 May 2009 23:17:25 +0000 Subject: Add missing path to find invocation for tags/TAGS creation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29310 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ec957df3c2..ae1b065b8a 100644 --- a/Makefile +++ b/Makefile @@ -982,10 +982,10 @@ doxygen: doxygen DOCS/tech/Doxyfile TAGS: - rm -f $@; find -name '*.[chS]' -o -name '*.asm' | xargs etags -a + rm -f $@; find . -name '*.[chS]' -o -name '*.asm' | xargs etags -a tags: - rm -f $@; find -name '*.[chS]' -o -name '*.asm' | xargs ctags -a + rm -f $@; find . -name '*.[chS]' -o -name '*.asm' | xargs ctags -a -- cgit v1.2.3 From ebf2f1d669fd9e36b7e8d65bdd076258858a52e8 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 21 May 2009 08:46:24 +0000 Subject: cosmetics: alphabetically sort SRCS_MPLAYER git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29318 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ae1b065b8a..285291a278 100644 --- a/Makefile +++ b/Makefile @@ -658,18 +658,18 @@ SRCS_MPLAYER-$(XVR100) += libvo/vo_xvr100.c SRCS_MPLAYER-$(YUV4MPEG) += libvo/vo_yuv4mpeg.c SRCS_MPLAYER-$(ZR) += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c -SRCS_MPLAYER = mplayer.c \ +SRCS_MPLAYER = command.c \ m_property.c \ + mixer.c \ mp_fifo.c \ mp_msg.c \ - mixer.c \ + mplayer.c \ parser-mpcmd.c \ - command.c \ input/input.c \ - libao2/audio_out.c \ libao2/ao_mpegpes.c \ libao2/ao_null.c \ libao2/ao_pcm.c \ + libao2/audio_out.c \ libvo/aspect.c \ libvo/geometry.c \ libvo/spuenc.c \ -- cgit v1.2.3 From 53d273ec22c2e662e2974c6e8cd1a7895ca06549 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jun 2009 21:09:35 +0000 Subject: Rename LIBVORBIS Makefile variable to VORBIS. The latter is more clear as it can represent either Tremor or libvorbis. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29365 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 285291a278..0cb776aadf 100644 --- a/Makefile +++ b/Makefile @@ -193,8 +193,6 @@ SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c -SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \ - libmpdemux/demux_ogg.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ stream/stream_live555.c @@ -288,6 +286,8 @@ SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c 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-$(VORBIS) += libmpcodecs/ad_libvorbis.c \ + libmpdemux/demux_ogg.c SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c SRCS_COMMON-$(WIN32_EMULATION) += loader/elfdll.c \ loader/ext.c \ -- cgit v1.2.3