From dc6d14fb1b20e86cc24c6fbe5ce239566e5d588e Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 18 May 2008 11:53:00 +0000 Subject: Add support for AppleIR Remote as an input under Linux systems. This requires Linux 2.6 with evdev and appleir drivers. The keymapping is done to mimics the one that was done for MacOSX. WARNING: Most distributions do not seems to bother and only let root access to the device. Modify udev rules accordingly if you want regular user to be able to use the remote. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26795 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bb0c236daf..7d4790af85 100644 --- a/Makefile +++ b/Makefile @@ -510,6 +510,7 @@ SRCS_MPLAYER = mplayer.c \ $(addprefix libvo/,$(VO_SRCS)) \ SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c +SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ gui/bitmap.c \ gui/cfg.c \ -- cgit v1.2.3 From fdb2bbc502d8a5b701726fa0f72cb99659dee7d8 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 14:14:15 +0000 Subject: Remove skin download instructions, they have no place in the Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26803 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7d4790af85..011c74eb81 100644 --- a/Makefile +++ b/Makefile @@ -849,8 +849,6 @@ install-mencoder: mencoder$(EXESUF) install-gui: -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) $(INSTALL) -d $(DATADIR)/skins - @echo "*** Download skin(s) at http://www.mplayerhq.hu/design7/dload.html" - @echo "*** for GUI, and extract to $(DATADIR)/skins/" $(INSTALL) -d $(prefix)/share/pixmaps $(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/ $(INSTALL) -d $(prefix)/share/applications -- cgit v1.2.3 From 925ab6050f595fc9ecb69e865e144ff16fbeda3c Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 14:23:45 +0000 Subject: There is no need to ignore errors from 'rm -f' commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26804 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 011c74eb81..1c4deedf85 100644 --- a/Makefile +++ b/Makefile @@ -855,11 +855,11 @@ install-gui: $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ uninstall: - -rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) - -rm -f $(BINDIR)/mencoder$(EXESUF) - -rm -f $(MANDIR)/man1/mencoder.1 $(MANDIR)/man1/mplayer.1 - -rm -f $(prefix)/share/pixmaps/mplayer.xpm - -rm -f $(prefix)/share/applications/mplayer.desktop + rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) + rm -f $(BINDIR)/mencoder$(EXESUF) + rm -f $(MANDIR)/man1/mencoder.1 $(MANDIR)/man1/mplayer.1 + rm -f $(prefix)/share/pixmaps/mplayer.xpm + rm -f $(prefix)/share/applications/mplayer.desktop for lang in $(MAN_LANG); do \ if test "$$lang" != "en"; then \ rm -f $(MANDIR)/$$lang/man1/mplayer.1 \ -- cgit v1.2.3 From a7807bac145998a939bedf1b85f464a335f1b60c Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 18 May 2008 14:55:26 +0000 Subject: Sort alphabetically git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26805 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1c4deedf85..c9f525a7d4 100644 --- a/Makefile +++ b/Makefile @@ -509,8 +509,8 @@ SRCS_MPLAYER = mplayer.c \ libvo/vo_yuv4mpeg.c \ $(addprefix libvo/,$(VO_SRCS)) \ -SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c +SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ gui/bitmap.c \ gui/cfg.c \ -- cgit v1.2.3 From 43686e086729642b741f804f56e7ae01a0a7a89a Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 15:53:55 +0000 Subject: Do not remove gmplayer.1, it is never installed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26808 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c9f525a7d4..1736b12ef7 100644 --- a/Makefile +++ b/Makefile @@ -863,8 +863,7 @@ uninstall: for lang in $(MAN_LANG); do \ if test "$$lang" != "en"; then \ rm -f $(MANDIR)/$$lang/man1/mplayer.1 \ - $(MANDIR)/$$lang/man1/mencoder.1 \ - $(MANDIR)/$$lang/man1/gmplayer.1 ; \ + $(MANDIR)/$$lang/man1/mencoder.1 ; \ fi ; \ done -- cgit v1.2.3 From 4abe690d642301feed66848011dd697fbb4845ac Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:01:46 +0000 Subject: Simplify installation rules with $<. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26809 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1736b12ef7..fd4023f633 100644 --- a/Makefile +++ b/Makefile @@ -824,7 +824,7 @@ install-dirs: if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi install-mplayer: mplayer$(EXESUF) - $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR) + $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) install-mplayer-man: for lang in $(MAN_LANG); do \ @@ -837,7 +837,7 @@ install-mplayer-man: done install-mencoder: mencoder$(EXESUF) - $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR) + $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) for lang in $(MAN_LANG); do \ if test "$$lang" = en ; then \ cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ -- cgit v1.2.3 From b53e8a4d01e56db6df976871907642e9e4574873 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:03:44 +0000 Subject: The install-gui target depends on the install-mplayer target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26810 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fd4023f633..eecc138d99 100644 --- a/Makefile +++ b/Makefile @@ -846,7 +846,7 @@ install-mencoder: mencoder$(EXESUF) fi ; \ done -install-gui: +install-gui: install-mplayer -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) $(INSTALL) -d $(DATADIR)/skins $(INSTALL) -d $(prefix)/share/pixmaps -- cgit v1.2.3 From cdf6e749bc30d630a54da4ff27cd4ab9f1ce440f Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:04:51 +0000 Subject: Separate install-mencoder and install-mencoder-man targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26811 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index eecc138d99..94d691a78b 100644 --- a/Makefile +++ b/Makefile @@ -638,7 +638,7 @@ ALL_PRG-$(MENCODER) += mencoder$(EXESUF) ALL_PRG += $(ALL_PRG-yes) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man -INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man +INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man install-mencoder-man INSTALL_TARGETS-$(GUI_GTK) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) @@ -838,6 +838,8 @@ install-mplayer-man: install-mencoder: mencoder$(EXESUF) $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) + +install-mencoder-man: for lang in $(MAN_LANG); do \ if test "$$lang" = en ; then \ cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ -- cgit v1.2.3 From a6458b3065210f89fbc352073a9b59d50d569856 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:06:31 +0000 Subject: Introduce a pattern rule for install-mplayer and install-mencoder targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26812 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 94d691a78b..5473d523d0 100644 --- a/Makefile +++ b/Makefile @@ -823,7 +823,7 @@ install-dirs: $(INSTALL) -d $(CONFDIR) if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi -install-mplayer: mplayer$(EXESUF) +install-%: %$(EXESUF) $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) install-mplayer-man: @@ -836,9 +836,6 @@ install-mplayer-man: fi ; \ done -install-mencoder: mencoder$(EXESUF) - $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) - install-mencoder-man: for lang in $(MAN_LANG); do \ if test "$$lang" = en ; then \ -- cgit v1.2.3 From f931f2440eda6c6f3249f11bca1ed78773032acd Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:08:46 +0000 Subject: Remove (hopefully obsolete) codecs.conf workaround. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26813 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5473d523d0..f2bd2c0284 100644 --- a/Makefile +++ b/Makefile @@ -821,7 +821,6 @@ install-dirs: $(INSTALL) -d $(DATADIR) $(INSTALL) -d $(MANDIR)/man1 $(INSTALL) -d $(CONFDIR) - if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi install-%: %$(EXESUF) $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -- cgit v1.2.3 From 69c70193c7650ecd9b05f6c5364db97060b680a8 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:13:46 +0000 Subject: Always uninstall English man pages instead of never. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26814 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f2bd2c0284..4a60389b5b 100644 --- a/Makefile +++ b/Makefile @@ -858,11 +858,10 @@ uninstall: rm -f $(MANDIR)/man1/mencoder.1 $(MANDIR)/man1/mplayer.1 rm -f $(prefix)/share/pixmaps/mplayer.xpm rm -f $(prefix)/share/applications/mplayer.desktop + rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 for lang in $(MAN_LANG); do \ - if test "$$lang" != "en"; then \ rm -f $(MANDIR)/$$lang/man1/mplayer.1 \ $(MANDIR)/$$lang/man1/mencoder.1 ; \ - fi ; \ done clean: -- cgit v1.2.3 From 3661a18bd7329117f69c47caaa798307bb9fa5ca Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:16:39 +0000 Subject: Replace shell for loop with proper foreach make construct in uninstall target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26815 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4a60389b5b..9723032098 100644 --- a/Makefile +++ b/Makefile @@ -859,10 +859,7 @@ uninstall: rm -f $(prefix)/share/pixmaps/mplayer.xpm rm -f $(prefix)/share/applications/mplayer.desktop rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 - for lang in $(MAN_LANG); do \ - rm -f $(MANDIR)/$$lang/man1/mplayer.1 \ - $(MANDIR)/$$lang/man1/mencoder.1 ; \ - done + rm -f $(foreach lang,$(MAN_LANG),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) clean: rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) -- cgit v1.2.3 From 63b29dabbcba96c861556e3563f2cadac43c94b5 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:20:17 +0000 Subject: install-mencoder-man depends on install-mplayer-man. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26816 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9723032098..d9209880f1 100644 --- a/Makefile +++ b/Makefile @@ -638,7 +638,7 @@ ALL_PRG-$(MENCODER) += mencoder$(EXESUF) ALL_PRG += $(ALL_PRG-yes) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man -INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man install-mencoder-man +INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man INSTALL_TARGETS-$(GUI_GTK) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) @@ -835,7 +835,7 @@ install-mplayer-man: fi ; \ done -install-mencoder-man: +install-mencoder-man: install-mplayer-man for lang in $(MAN_LANG); do \ if test "$$lang" = en ; then \ cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ -- cgit v1.2.3 From 049d820592abd5ac25d0fa8167ee49df3c28f8a6 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:25:20 +0000 Subject: Introduce make variable common to the GTK and Windows GUI and use it in the appropriate places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26817 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d9209880f1..b26d784e43 100644 --- a/Makefile +++ b/Makefile @@ -511,8 +511,8 @@ SRCS_MPLAYER = mplayer.c \ SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c +SRCS_MPLAYER-$(GUI) += gui/bitmap.c SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ - gui/bitmap.c \ gui/cfg.c \ gui/interface.c \ gui/mplayer/gui_common.c \ @@ -538,8 +538,7 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ gui/wm/ws.c \ gui/wm/wsxdnd.c \ -SRCS_MPLAYER-$(GUI_WIN32) += gui/bitmap.c \ - gui/win32/dialogs.c \ +SRCS_MPLAYER-$(GUI_WIN32) += gui/win32/dialogs.c \ gui/win32/gui.c \ gui/win32/interface.c \ gui/win32/playlist.c \ @@ -639,7 +638,7 @@ ALL_PRG += $(ALL_PRG-yes) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man -INSTALL_TARGETS-$(GUI_GTK) += install-gui +INSTALL_TARGETS-$(GUI) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) DIRS = . \ -- cgit v1.2.3 From 2ac55e233184def4218c2070ced7eab4fd2004bf Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:43:17 +0000 Subject: Create directories for the translated man pages in the install-dirs target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26819 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b26d784e43..ad805c42fe 100644 --- a/Makefile +++ b/Makefile @@ -819,6 +819,7 @@ install-dirs: $(INSTALL) -d $(BINDIR) $(INSTALL) -d $(DATADIR) $(INSTALL) -d $(MANDIR)/man1 + $(INSTALL) -d $(foreach lang,$(MAN_LANG),$(MANDIR)/$(lang)/man1) $(INSTALL) -d $(CONFDIR) install-%: %$(EXESUF) @@ -829,7 +830,6 @@ install-mplayer-man: if test "$$lang" = en ; then \ $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ ; \ else \ - $(INSTALL) -d $(MANDIR)/$$lang/man1 ; \ $(INSTALL) -c -m 644 DOCS/man/$$lang/mplayer.1 $(MANDIR)/$$lang/man1/ ; \ fi ; \ done -- cgit v1.2.3 From 6a8693845ccd46efe00d6bb45184593437e2881a Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:05:16 +0000 Subject: Replace hackish shell loops for man page installation with make constructs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26820 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ad805c42fe..74aa3c1376 100644 --- a/Makefile +++ b/Makefile @@ -825,23 +825,27 @@ install-dirs: install-%: %$(EXESUF) $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-mplayer-man: - for lang in $(MAN_LANG); do \ - if test "$$lang" = en ; then \ - $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ ; \ - else \ - $(INSTALL) -c -m 644 DOCS/man/$$lang/mplayer.1 $(MANDIR)/$$lang/man1/ ; \ - fi ; \ - done - -install-mencoder-man: install-mplayer-man - for lang in $(MAN_LANG); do \ - if test "$$lang" = en ; then \ - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ - else \ - cd $(MANDIR)/$$lang/man1 && ln -sf mplayer.1 mencoder.1 ; \ - fi ; \ - done +install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) +install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang)) + +install-mplayer-man-en: + $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ + +install-mencoder-man-en: install-mplayer-man-en + cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 + +define MPLAYER_MAN_RULE +install-mplayer-man-$(lang): + $(INSTALL) -c -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ +endef + +define MENCODER_MAN_RULE +install-mencoder-man-$(lang): install-mplayer-man-$(lang) + cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 +endef + +$(foreach lang,$(MAN_LANG),$(eval $(MPLAYER_MAN_RULE))) +$(foreach lang,$(MAN_LANG),$(eval $(MENCODER_MAN_RULE))) install-gui: install-mplayer -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) -- cgit v1.2.3 From 74c67fee1fb36da630db2a78fd9798002699f46b Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:05:55 +0000 Subject: Install the required man page directories in the man page targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26821 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 74aa3c1376..8e52a97ca7 100644 --- a/Makefile +++ b/Makefile @@ -818,8 +818,6 @@ install: install-dirs $(INSTALL_TARGETS) install-dirs: $(INSTALL) -d $(BINDIR) $(INSTALL) -d $(DATADIR) - $(INSTALL) -d $(MANDIR)/man1 - $(INSTALL) -d $(foreach lang,$(MAN_LANG),$(MANDIR)/$(lang)/man1) $(INSTALL) -d $(CONFDIR) install-%: %$(EXESUF) @@ -829,6 +827,7 @@ install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang)) install-mplayer-man-en: + $(INSTALL) -d $(MANDIR)/man1 $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ install-mencoder-man-en: install-mplayer-man-en @@ -836,6 +835,7 @@ install-mencoder-man-en: install-mplayer-man-en define MPLAYER_MAN_RULE install-mplayer-man-$(lang): + $(INSTALL) -d $(MANDIR)/$(lang)/man1 $(INSTALL) -c -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ endef -- cgit v1.2.3 From 7ac3e16660a1ce3214a0645e8b802b7b8471e7dc Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:12:49 +0000 Subject: Do not install DATADIR always, the GUI installation target takes care of this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26822 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8e52a97ca7..22d95f972e 100644 --- a/Makefile +++ b/Makefile @@ -817,7 +817,6 @@ install: install-dirs $(INSTALL_TARGETS) install-dirs: $(INSTALL) -d $(BINDIR) - $(INSTALL) -d $(DATADIR) $(INSTALL) -d $(CONFDIR) install-%: %$(EXESUF) -- cgit v1.2.3 From b96c2f2ed082cc5195ffb57f720bfe1f07076fa8 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:16:43 +0000 Subject: install-mplayer and install-mencoder targets should depend on install-dirs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26823 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 22d95f972e..6b64be9702 100644 --- a/Makefile +++ b/Makefile @@ -813,13 +813,13 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) ###### installation rules ####### -install: install-dirs $(INSTALL_TARGETS) +install: $(INSTALL_TARGETS) install-dirs: $(INSTALL) -d $(BINDIR) $(INSTALL) -d $(CONFDIR) -install-%: %$(EXESUF) +install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) -- cgit v1.2.3 From fec125516bd226becc5d4003087a08793342a07f Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:35:54 +0000 Subject: one less level of indirection for install and program targets git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26826 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6b64be9702..a3e53a8c19 100644 --- a/Makefile +++ b/Makefile @@ -634,12 +634,10 @@ MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) -ALL_PRG += $(ALL_PRG-yes) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man INSTALL_TARGETS-$(GUI) += install-gui -INSTALL_TARGETS += $(INSTALL_TARGETS-yes) DIRS = . \ dvdread \ @@ -698,7 +696,7 @@ PARTS = libavcodec \ ###### generic rules ####### -all: $(ALL_PRG) +all: $(ALL_PRG-yes) %.d: %.c $(MPDEPEND_CMD) > $@ @@ -813,7 +811,7 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) ###### installation rules ####### -install: $(INSTALL_TARGETS) +install: $(INSTALL_TARGETS-yes) install-dirs: $(INSTALL) -d $(BINDIR) @@ -880,7 +878,7 @@ doxygen: doxygen_clean: -rm -rf DOCS/tech/doxygen strip: - strip -s $(ALL_PRG) + strip -s $(ALL_PRG-yes) TAGS: rm -f $@; ( find -name '*.[chS]' -print ) | xargs etags -a -- cgit v1.2.3 From 5ae188e4797d222fd4760b34cc5706ab69f50d5b Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:38:16 +0000 Subject: Merge directory installation commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26827 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a3e53a8c19..32cc06fc45 100644 --- a/Makefile +++ b/Makefile @@ -814,8 +814,7 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) install: $(INSTALL_TARGETS-yes) install-dirs: - $(INSTALL) -d $(BINDIR) - $(INSTALL) -d $(CONFDIR) + $(INSTALL) -d $(BINDIR) $(CONFDIR) install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) @@ -846,10 +845,8 @@ $(foreach lang,$(MAN_LANG),$(eval $(MENCODER_MAN_RULE))) install-gui: install-mplayer -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) - $(INSTALL) -d $(DATADIR)/skins - $(INSTALL) -d $(prefix)/share/pixmaps + $(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications $(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/ - $(INSTALL) -d $(prefix)/share/applications $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ uninstall: -- cgit v1.2.3 From 929365575a97aef2d6fbde740cc99d6224d9d8cf Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:40:00 +0000 Subject: Remove unused strip target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26828 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 32cc06fc45..bc13902034 100644 --- a/Makefile +++ b/Makefile @@ -874,8 +874,6 @@ doxygen: doxygen_clean: -rm -rf DOCS/tech/doxygen -strip: - strip -s $(ALL_PRG-yes) TAGS: rm -f $@; ( find -name '*.[chS]' -print ) | xargs etags -a @@ -979,5 +977,5 @@ toolsclean: -include $(DEPS) -.PHONY: all doxygen *install* recurse strip *tools +.PHONY: all doxygen *install* recurse *tools .PHONY: checkheaders *clean dep depend tests -- cgit v1.2.3 From 955495414e51fe1aff47e76d9fd18edcabd4e4d3 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 23:16:30 +0000 Subject: Replace hack to disable iconv conversion of messages with something more sane. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26831 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bc13902034..46d59343f1 100644 --- a/Makefile +++ b/Makefile @@ -765,7 +765,7 @@ help_mp.h: help/help_mp-en.h $(HELP_FILE) @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),) +ifeq ($(CHARSET),UTF-8) @echo '#include "$(HELP_FILE)"' >> help_mp.h else iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h -- cgit v1.2.3 From 5f7c758c800bb8e0003f5f4a4c9fa2d79b31547c Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 23:33:46 +0000 Subject: Move the logic that decides if untranslated messages need to be added to help_mp.h into the helper script that generates those messages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26832 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 46d59343f1..aa61f75912 100644 --- a/Makefile +++ b/Makefile @@ -771,11 +771,8 @@ 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 -- cgit v1.2.3 From ad9dc7735d6893b234b6815b171b5a20d85e80d1 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 23:55:01 +0000 Subject: Do not hide that we are running a helper script. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26833 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index aa61f75912..514fa61f8a 100644 --- a/Makefile +++ b/Makefile @@ -772,7 +772,7 @@ else endif @echo '#endif /* MPLAYER_HELP_MP_H */' >> 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 + help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h -- cgit v1.2.3 From 7016801baeff5c53c154d333dca2d2b3a1e82365 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 23:58:05 +0000 Subject: Simplify help_mp.h generation commands by using $@. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26834 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 514fa61f8a..a50d99f0d9 100644 --- a/Makefile +++ b/Makefile @@ -761,18 +761,18 @@ 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 + @echo '// WARNING! This is a generated file. Do NOT edit.' > $@ + @echo '// See the help/ subdir for the editable files.' >> $@ + @echo '#ifndef MPLAYER_HELP_MP_H' >> $@ + @echo '#define MPLAYER_HELP_MP_H' >> $@ ifeq ($(CHARSET),UTF-8) - @echo '#include "$(HELP_FILE)"' >> help_mp.h + @echo '#include "$(HELP_FILE)"' >> $@ else - iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h + iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> $@ endif - @echo '#endif /* MPLAYER_HELP_MP_H */' >> 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 + @echo '#endif /* MPLAYER_HELP_MP_H */' >> $@ + @echo '// untranslated messages from the English master file:' >> $@ + help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> $@ -- cgit v1.2.3 From ab36efa0d7d8b511d56cf2fbd3c3d094704eb88e Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 19 May 2008 00:05:18 +0000 Subject: The multiple inclusion guard in help_mp.h has to cover the whole file, including the non-translated parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26835 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a50d99f0d9..dfe3197532 100644 --- a/Makefile +++ b/Makefile @@ -770,9 +770,9 @@ ifeq ($(CHARSET),UTF-8) else iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> $@ endif - @echo '#endif /* MPLAYER_HELP_MP_H */' >> $@ @echo '// untranslated messages from the English master file:' >> $@ help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> $@ + @echo '#endif /* MPLAYER_HELP_MP_H */' >> $@ -- cgit v1.2.3 From 745662aafa3ad219b72571ba9caad278f3521e11 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 19 May 2008 00:07:17 +0000 Subject: If character set conversion for help_mp.h is required, do it on the whole file including the parts added from the English master file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26836 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dfe3197532..608e777ba4 100644 --- a/Makefile +++ b/Makefile @@ -765,14 +765,13 @@ help_mp.h: help/help_mp-en.h $(HELP_FILE) @echo '// See the help/ subdir for the editable files.' >> $@ @echo '#ifndef MPLAYER_HELP_MP_H' >> $@ @echo '#define MPLAYER_HELP_MP_H' >> $@ -ifeq ($(CHARSET),UTF-8) - @echo '#include "$(HELP_FILE)"' >> $@ -else - iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> $@ -endif + @cat "$(HELP_FILE)" >> $@ @echo '// untranslated messages from the English master file:' >> $@ help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> $@ @echo '#endif /* MPLAYER_HELP_MP_H */' >> $@ +ifneq ($(CHARSET),UTF-8) + iconv -f UTF-8 -t $(CHARSET) $@ > $@.tmp; mv $@.tmp $@ +endif -- cgit v1.2.3 From 793e5b324e8876472c8f7542c0bd198cc8645638 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 23 May 2008 14:52:12 +0000 Subject: Get rid of "define RECURSIVE_RULE" since a lot of make version have problems with it, especially with -j n. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26858 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 608e777ba4..488ae0c0e7 100644 --- a/Makefile +++ b/Makefile @@ -719,12 +719,10 @@ checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done -define RECURSIVE_RULE -$(part)/$(part).a: recurse - $(MAKE) -C $(part) -endef +ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a) -$(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) +$(ALLPARTLIBS): recurse + $(MAKE) -C $(@D) mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) -- cgit v1.2.3 From db37cb2fe7c9b05399121c20df07a5f35a454305 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 09:04:47 +0000 Subject: Link codec-cfg programs against mp_msg-mencoder.o instead of mp_msg.o. The latter can pick up GUI dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26881 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 488ae0c0e7..0433d694e1 100644 --- a/Makefile +++ b/Makefile @@ -736,11 +736,11 @@ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ -codecs2html$(EXESUF): mp_msg.o +codecs2html$(EXESUF): mp_msg-mencoder.o $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@ -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 $@ +codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg-mencoder.o osdep/getch2.o + $(CC) -I. -DTESTING codec-cfg.c mp_msg-mencoder.o osdep/getch2.o -ltermcap -o $@ osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -I. -o $@ $< -- cgit v1.2.3 From f4bd0813d55d24650bfe53aed149f5b7e864e254 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 09:11:13 +0000 Subject: Fix codec-cfg-test linking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26882 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0433d694e1..f3293466dc 100644 --- a/Makefile +++ b/Makefile @@ -739,9 +739,6 @@ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf codecs2html$(EXESUF): mp_msg-mencoder.o $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@ -codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg-mencoder.o osdep/getch2.o - $(CC) -I. -DTESTING codec-cfg.c mp_msg-mencoder.o osdep/getch2.o -ltermcap -o $@ - osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -I. -o $@ $< @@ -881,6 +878,9 @@ tags: TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm +codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h $(TEST_OBJS) + $(CC) -I. -DTESTING -o $@ codec-cfg.c $(TEST_OBJS) + 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) -- cgit v1.2.3 From 250f52082d0793c7bc170f92012abba20c32cfa7 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:05:43 +0000 Subject: There is no need to ignore the return value of an 'rm -rf' command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26883 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f3293466dc..a7b46b77ed 100644 --- a/Makefile +++ b/Makefile @@ -864,7 +864,7 @@ doxygen: doxygen DOCS/tech/Doxyfile doxygen_clean: - -rm -rf DOCS/tech/doxygen + rm -rf DOCS/tech/doxygen TAGS: rm -f $@; ( find -name '*.[chS]' -print ) | xargs etags -a -- cgit v1.2.3 From 196593fbd4aca8cef0a2928ac0865edd71cd305f Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:09:17 +0000 Subject: Correct dependency declaration for codec-cfg-test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26884 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a7b46b77ed..7da8bbae13 100644 --- a/Makefile +++ b/Makefile @@ -878,8 +878,8 @@ tags: TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h $(TEST_OBJS) - $(CC) -I. -DTESTING -o $@ codec-cfg.c $(TEST_OBJS) +codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) + $(CC) -I. -DTESTING -o $@ $< $(TEST_OBJS) liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -- cgit v1.2.3 From cdbbd38e9b2bdcb4170a5ceb4264cc9e218b0ecf Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:13:43 +0000 Subject: Add codec-cfg-test to list of TESTS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26885 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7da8bbae13..7b0c9a3c45 100644 --- a/Makefile +++ b/Makefile @@ -894,7 +894,8 @@ 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) \ +TESTS = codec-cfg-test$(EXESUF) \ + liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) -- cgit v1.2.3 From a10452836d06f87e4a58a11de18379609b3310d7 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:14:24 +0000 Subject: Add missing -I. to fix codecs2html compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26886 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7b0c9a3c45..6138f24f56 100644 --- a/Makefile +++ b/Makefile @@ -737,7 +737,7 @@ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ codecs2html$(EXESUF): mp_msg-mencoder.o - $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@ + $(CC) -I. -DCODECS2HTML codec-cfg.c $^ -o $@ osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -I. -o $@ $< -- cgit v1.2.3 From d3ff5799f90f613f2b428064dfb039855b160e34 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:19:35 +0000 Subject: cosmetics: Move some rules to better places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26887 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6138f24f56..45ac3de0e7 100644 --- a/Makefile +++ b/Makefile @@ -736,25 +736,12 @@ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ -codecs2html$(EXESUF): mp_msg-mencoder.o - $(CC) -I. -DCODECS2HTML codec-cfg.c $^ -o $@ - -osdep/mplayer-rc.o: osdep/mplayer.rc version.h - $(WINDRES) -I. -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.' > $@ @echo '// See the help/ subdir for the editable files.' >> $@ @@ -768,6 +755,16 @@ ifneq ($(CHARSET),UTF-8) iconv -f UTF-8 -t $(CHARSET) $@ > $@.tmp; mv $@.tmp $@ endif +# 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` + +osdep/mplayer-rc.o: osdep/mplayer.rc version.h + $(WINDRES) -I. -o $@ $< + ###### dependency declarations / specific CFLAGS ###### @@ -878,6 +875,9 @@ tags: TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm +codecs2html$(EXESUF): mp_msg-mencoder.o + $(CC) -I. -DCODECS2HTML codec-cfg.c $^ -o $@ + codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $< $(TEST_OBJS) -- cgit v1.2.3 From 00b5f90451752e2b794cef680348616fc8333bbd Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:20:27 +0000 Subject: Fix dependency declaration for codecs2html. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26888 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 45ac3de0e7..5e75f4189b 100644 --- a/Makefile +++ b/Makefile @@ -875,8 +875,8 @@ tags: TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -codecs2html$(EXESUF): mp_msg-mencoder.o - $(CC) -I. -DCODECS2HTML codec-cfg.c $^ -o $@ +codecs2html$(EXESUF): codec-cfg.c mp_msg-mencoder.o + $(CC) -I. -DCODECS2HTML $^ -o $@ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $< $(TEST_OBJS) -- cgit v1.2.3 From 4937b16c4466516c0a5d4359698195eac2f93a90 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:21:19 +0000 Subject: Add codecs2html to TESTS variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26889 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5e75f4189b..0c6120f66f 100644 --- a/Makefile +++ b/Makefile @@ -894,7 +894,7 @@ 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 = codec-cfg-test$(EXESUF) \ +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) -- cgit v1.2.3 From 2b085d789799517c598dcb7f9937ce40dba3af2a Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:22:55 +0000 Subject: codecs2html and codec-cfg-test are removed by toolsclean. Do not remove them redundantly upon distclean. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26890 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0c6120f66f..e506dbc9fe 100644 --- a/Makefile +++ b/Makefile @@ -854,8 +854,7 @@ distclean: clean doxygen_clean testsclean toolsclean rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ version.h $(VIDIX_PCI_FILES) \ - codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ - cpuinfo$(EXESUF) TAGS tags + codec-cfg$(EXESUF) cpuinfo$(EXESUF) TAGS tags doxygen: doxygen DOCS/tech/Doxyfile -- cgit v1.2.3 From 853c366adb6ae6fd00090c44b270beb8a2e08f45 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:24:07 +0000 Subject: Merge doxygen_clean rule into distclean. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26891 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e506dbc9fe..41f00c3e0d 100644 --- a/Makefile +++ b/Makefile @@ -850,7 +850,8 @@ clean: rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) rm -f mplayer$(EXESUF) mencoder$(EXESUF) -distclean: clean doxygen_clean testsclean toolsclean +distclean: clean testsclean toolsclean + rm -rf DOCS/tech/doxygen rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ version.h $(VIDIX_PCI_FILES) \ @@ -859,9 +860,6 @@ distclean: clean doxygen_clean testsclean toolsclean doxygen: doxygen DOCS/tech/Doxyfile -doxygen_clean: - rm -rf DOCS/tech/doxygen - TAGS: rm -f $@; ( find -name '*.[chS]' -print ) | xargs etags -a -- cgit v1.2.3 From e236fc558eae89c3443d5b131a12ccec221c6e33 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:25:18 +0000 Subject: Fix codecs2html linking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26892 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 41f00c3e0d..724d5e279f 100644 --- a/Makefile +++ b/Makefile @@ -872,7 +872,7 @@ tags: TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -codecs2html$(EXESUF): codec-cfg.c mp_msg-mencoder.o +codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) $(CC) -I. -DCODECS2HTML $^ -o $@ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) -- cgit v1.2.3 From 5d7c1d1a3712a03018d0f6569b317b5911d1ab90 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:28:00 +0000 Subject: Simplify codec-cfg-test command with $^. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26893 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 724d5e279f..8d087e2b42 100644 --- a/Makefile +++ b/Makefile @@ -876,7 +876,7 @@ codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) $(CC) -I. -DCODECS2HTML $^ -o $@ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) - $(CC) -I. -DTESTING -o $@ $< $(TEST_OBJS) + $(CC) -I. -DTESTING -o $@ $^ liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -- cgit v1.2.3 From e79064d8850913bcbeb5606443d510f730f1c348 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:29:23 +0000 Subject: cosmetics: Consistently place '-o $@' in compiler command line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26894 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8d087e2b42..c1aa7c47f2 100644 --- a/Makefile +++ b/Makefile @@ -731,7 +731,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MENCODER) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) -O -I. -DCODECS2HTML $< -o $@ + $(HOST_CC) -O -I. -DCODECS2HTML -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ @@ -873,7 +873,7 @@ tags: TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) - $(CC) -I. -DCODECS2HTML $^ -o $@ + $(CC) -I. -DCODECS2HTML -o $@ $^ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $^ -- cgit v1.2.3 From d1f1b61d026ac83f138043a27f33c0cc9e60ad47 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:31:57 +0000 Subject: Update comment heading. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26895 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c1aa7c47f2..4ce239b90b 100644 --- a/Makefile +++ b/Makefile @@ -797,7 +797,7 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) -###### installation rules ####### +###### installation / clean / generic rules ####### install: $(INSTALL_TARGETS-yes) -- cgit v1.2.3 From 3447bd1d0566efd1db43862c81e46e445d0f17c5 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 11:37:50 +0000 Subject: cosmetics: Move toolsclean target to a better place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26896 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4ce239b90b..10f8ce66db 100644 --- a/Makefile +++ b/Makefile @@ -923,6 +923,9 @@ ALLTOOLS = $(TOOLS) \ tools: $(TOOLS) alltools: $(ALLTOOLS) +toolsclean: + rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 + TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ @@ -964,9 +967,6 @@ NETSTREAM_DEPS = libavutil/libavutil.a \ TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) $(CC) $(CFLAGS) -o $@ $^ -toolsclean: - rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 - -include $(DEPS) .PHONY: all doxygen *install* recurse *tools -- cgit v1.2.3 From b27e02e1b475cc2c0fae7539542f5cdaa28dcd24 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 16:24:40 +0000 Subject: Mark VIDIX_PCI_FILES targets as NOTPARALLEL. They are all created simultaneously by the same command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26903 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 10f8ce66db..e455890c15 100644 --- a/Makefile +++ b/Makefile @@ -790,6 +790,9 @@ 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) +# Make sure that the awk processes do not step on each other's toes. +.NOTPARALLEL: $(VIDIX_PCI_FILES) + VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) -- cgit v1.2.3 From c9aed45201256f78c1334ba4a46a1ce0c6917ce2 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 16:46:30 +0000 Subject: Revert declaration .NOTPARALLEL. Unfortunately this special target does not have the expected sane semantics, but has a global effect instead... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26904 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e455890c15..10f8ce66db 100644 --- a/Makefile +++ b/Makefile @@ -790,9 +790,6 @@ 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) -# Make sure that the awk processes do not step on each other's toes. -.NOTPARALLEL: $(VIDIX_PCI_FILES) - VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) -- cgit v1.2.3 From 1bb19a7f48cccc40bac0af9d21870c3f87956e75 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 22:03:21 +0000 Subject: Move messages header file creation to a separate shell script. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26910 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 10f8ce66db..c853648e00 100644 --- a/Makefile +++ b/Makefile @@ -743,17 +743,7 @@ config.mak: configure @echo "############################################################" help_mp.h: help/help_mp-en.h $(HELP_FILE) - @echo '// WARNING! This is a generated file. Do NOT edit.' > $@ - @echo '// See the help/ subdir for the editable files.' >> $@ - @echo '#ifndef MPLAYER_HELP_MP_H' >> $@ - @echo '#define MPLAYER_HELP_MP_H' >> $@ - @cat "$(HELP_FILE)" >> $@ - @echo '// untranslated messages from the English master file:' >> $@ - help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> $@ - @echo '#endif /* MPLAYER_HELP_MP_H */' >> $@ -ifneq ($(CHARSET),UTF-8) - iconv -f UTF-8 -t $(CHARSET) $@ > $@.tmp; mv $@.tmp $@ -endif + help/help_create.sh $(HELP_FILE) $(CHARSET) # rebuild version.h each time the working copy is updated ifeq ($(wildcard .svn/entries),.svn/entries) -- cgit v1.2.3 From 61b101497d19e94a33db26dc8c693d206945cf5c Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 28 May 2008 12:40:15 +0000 Subject: Merge drivers/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26914 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c853648e00..e584834009 100644 --- a/Makefile +++ b/Makefile @@ -840,7 +840,7 @@ clean: rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) rm -f mplayer$(EXESUF) mencoder$(EXESUF) -distclean: clean testsclean toolsclean +distclean: clean testsclean toolsclean driversclean rm -rf DOCS/tech/doxygen rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ @@ -957,7 +957,41 @@ NETSTREAM_DEPS = libavutil/libavutil.a \ TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) $(CC) $(CFLAGS) -o $@ $^ + + +###### drivers ####### + +KERNEL_INC = /lib/modules/`uname -r`/build/include +KERNEL_VERSION = $(shell grep RELEASE $(KERNEL_INC)/linux/version.h | cut -d'"' -f2) +KERNEL_CFLAGS = -O2 -D__KERNEL__ -DMODULE -Wall -I$(KERNEL_INC) -include $(KERNEL_INC)/linux/modversions.h +KERNEL_OBJS = $(addprefix drivers/, mga_vid.o tdfx_vid.o radeon_vid.o rage128_vid.o) +MODULES_DIR = /lib/modules/$(KERNEL_VERSION)/misc + +drivers: $(KERNEL_OBJS) drivers/mga_vid_test drivers/tdfx_vid_test + +$(KERNEL_OBJS) drivers/mga_vid_test drivers/tdfx_vid_test: CFLAGS = $(KERNEL_CFLAGS) +drivers/mga_vid.o: drivers/mga_vid.c drivers/mga_vid.h +drivers/tdfx_vid.o: drivers/tdfx_vid.c drivers/3dfx.h +drivers/radeon_vid.o drivers/rage128_vid.o: CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -fno-common -ffast-math +drivers/radeon_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h +drivers/rage128_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h + $(CC) $(CFLAGS) -DRAGE128 -c $< -o $@ + +install-drivers: + -mkdir -p $(MODULES_DIR) + install -m 644 $(KERNEL_OBJS) $(MODULES_DIR) + depmod -a + -mknod /dev/mga_vid c 178 0 + -mknod /dev/tdfx_vid c 178 0 + -mknod /dev/radeon_vid c 178 0 + -ln -s /dev/radeon_vid /dev/rage128_vid + +driversclean: + rm -f drivers/*.o drivers/*~ drivers/mga_vid_test drivers/tdfx_vid_test + + + -include $(DEPS) -.PHONY: all doxygen *install* recurse *tools +.PHONY: all doxygen *install* recurse *tools drivers .PHONY: checkheaders *clean dep depend tests -- cgit v1.2.3 From 6feacc0cc4817b21256d5d76efc81f70120f2a2c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 29 May 2008 00:33:29 +0000 Subject: The install-drivers target should depend on the drivers target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26916 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e584834009..e0234bb46c 100644 --- a/Makefile +++ b/Makefile @@ -977,7 +977,7 @@ drivers/radeon_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h drivers/rage128_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h $(CC) $(CFLAGS) -DRAGE128 -c $< -o $@ -install-drivers: +install-drivers: drivers -mkdir -p $(MODULES_DIR) install -m 644 $(KERNEL_OBJS) $(MODULES_DIR) depmod -a -- cgit v1.2.3 From 5d87f6d9cabcd61ba2b8631aeb3608182d937976 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 30 May 2008 19:39:00 +0000 Subject: Merge vidix/dhahelper/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26934 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e0234bb46c..8ac4c13493 100644 --- a/Makefile +++ b/Makefile @@ -989,6 +989,19 @@ install-drivers: drivers driversclean: rm -f drivers/*.o drivers/*~ drivers/mga_vid_test drivers/tdfx_vid_test +dhahelper: vidix/dhahelper/dhahelper.o vidix/dhahelper/test + +vidix/dhahelper/dhahelper.o vidix/dhahelper/test: CFLAGS = $(KERNEL_CFLAGS) +vidix/dhahelper/dhahelper.o: vidix/dhahelper/dhahelper.c vidix/dhahelper/dhahelper.h + +install-dhahelper: vidix/dhahelper/dhahelper.o + -mkdir -p $(MODULES_DIR) + install -m 644 $< $(MODULES_DIR) + depmod -a + +dhahelperclean: + rm -f vidix/dhahelper/*.o vidix/dhahelper/*~ vidix/dhahelper/test + -include $(DEPS) -- cgit v1.2.3 From 13d53795d9ff5b9bb200717239a638212c97d08f Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 30 May 2008 20:09:31 +0000 Subject: Merge vidix/dhahelperwin/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26935 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8ac4c13493..ace763d472 100644 --- a/Makefile +++ b/Makefile @@ -1002,9 +1002,39 @@ install-dhahelper: vidix/dhahelper/dhahelper.o dhahelperclean: rm -f vidix/dhahelper/*.o vidix/dhahelper/*~ vidix/dhahelper/test +dhahelperwin: vidix/dhahelperwin/dhasetup.exe vidix/dhahelperwin/dhahelper.sys + +vidix/dhahelperwin/dhasetup.exe: vidix/dhahelperwin/dhasetup.c + $(CC) -o $@ $< + +vidix/dhahelperwin/dhahelper.o: vidix/dhahelperwin/dhahelper.c vidix/dhahelperwin/dhahelper.h + $(CC) -Wall -Os -c $< -o $@ + +vidix/dhahelperwin/dhahelper-rc.o: vidix/dhahelperwin/dhahelper.rc vidix/dhahelperwin/common.ver vidix/dhahelperwin/ntverp.h + $(WINDRES) -I. $< $@ + +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 + +vidix/dhahelperwin/temp.exp: vidix/dhahelperwin/base.tmp + dlltool --dllname vidix/dhahelperwin/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 + strip $@ + +dhahelperwinclean: + rm -f $(addprefix vidix/dhahelperwin/,*.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp) + -include $(DEPS) -.PHONY: all doxygen *install* recurse *tools drivers +.PHONY: all doxygen *install* recurse *tools drivers dhahelper* .PHONY: checkheaders *clean dep depend tests -- cgit v1.2.3 From 74aa81596cecae105d6442452d2cf5b164b878d2 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 30 May 2008 20:10:36 +0000 Subject: Add install-dhahelperwin target to simplify dhahelper installation on Windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26936 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ace763d472..827a3553e5 100644 --- a/Makefile +++ b/Makefile @@ -1029,6 +1029,9 @@ vidix/dhahelperwin/dhahelper.sys: vidix/dhahelperwin/temp.exp vidix/dhahelperwin vidix/dhahelperwin/dhahelper-rc.o -lntoskrnl strip $@ +install-dhahelperwin: + vidix/dhahelperwin/dhasetup.exe install + dhahelperwinclean: rm -f $(addprefix vidix/dhahelperwin/,*.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp) -- cgit v1.2.3