diff options
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | doc/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -17,7 +17,7 @@ AVPROGS-$(CONFIG_FFSERVER) += ffserver AVPROGS := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) INSTPROGS = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) -PROGS += $(AVPROGS-yes) +PROGS += $(AVPROGS) AVBASENAMES = ffmpeg ffplay ffprobe ffserver ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF)) @@ -100,9 +100,9 @@ $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1)) -include $$(OBJS-$(1):.o=.d) endef -$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P)))) +$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(PROGSSUF)$(EXESUF)=)))) -$(PROGS:%=%$(PROGSSUF)$(EXESUF)): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) +$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) $(CP) $< $@ $(STRIP) $@ diff --git a/doc/Makefile b/doc/Makefile index fad5cfc5f1..5856f3de01 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -41,7 +41,7 @@ ALL_DOC_EXAMPLES = muxing DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF)) ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF)) -PROGS += $(DOC_EXAMPLES-yes:%=doc/examples/%) +PROGS += $(DOC_EXAMPLES) all-$(CONFIG_DOC): doc |