diff Makefile @ 26794:cf60ce406b0b

one less level of indirection for install and program targets
author diego
date Sun, 18 May 2008 17:35:54 +0000
parents daa735e525a4
children 488f86cbc522
line wrap: on
line diff
--- a/Makefile	Sun May 18 17:32:51 2008 +0000
+++ b/Makefile	Sun May 18 17:35:54 2008 +0000
@@ -634,12 +634,10 @@
 
 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 @@
 
 ###### generic rules #######
 
-all: $(ALL_PRG)
+all: $(ALL_PRG-yes)
 
 %.d: %.c
 	$(MPDEPEND_CMD) > $@
@@ -813,7 +811,7 @@
 
 ###### installation rules #######
 
-install: $(INSTALL_TARGETS)
+install: $(INSTALL_TARGETS-yes)
 
 install-dirs:
 	$(INSTALL) -d $(BINDIR)
@@ -880,7 +878,7 @@
 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