[MPlayer-cvslog] r26826 - trunk/Makefile

[diego]

Author: diego
Date: Sun May 18 19:35:54 2008
New Revision: 26826

Log:
one less level of indirection for install and program targets


Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun May 18 19:35:54 2008
@@ -634,12 +634,10 @@ MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_
 
 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
 
 ###### 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