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