This will allow cleaner integration of building example programs.
---
Arguably a bit overkill as it renames a lot of stuff, but the end
result in combination with the next patch is slightly cleaner IMO.
Makefile | 33 ++++++++++++++++++---------------
doc/Makefile | 7 ++++---
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index af83cfa..343854f 100644
--- a/Makefile
+++ b/Makefile
@@ -56,21 +56,24 @@ COMPILE_S = $(call COMPILE,AS)
%.c %.h: TAG = GEN
-PROGS-$(CONFIG_AVCONV) += avconv
-PROGS-$(CONFIG_AVPLAY) += avplay
-PROGS-$(CONFIG_AVPROBE) += avprobe
-PROGS-$(CONFIG_AVSERVER) += avserver
+AVPROGS-$(CONFIG_AVCONV) += avconv
+AVPROGS-$(CONFIG_AVPLAY) += avplay
+AVPROGS-$(CONFIG_AVPROBE) += avprobe
+AVPROGS-$(CONFIG_AVSERVER) += avserver
-PROGS := $(PROGS-yes:%=%$(EXESUF))
+AVPROGS := $(AVPROGS-yes:%=%$(EXESUF))
OBJS-avconv = avconv_opt.o avconv_filter.o
+PROGS += $(AVPROGS)
+
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws
-BASENAMES = avconv avplay avprobe avserver
-ALLPROGS = $(BASENAMES:%=%$(EXESUF))
-ALLMANPAGES = $(BASENAMES:%=%.1)
+AVBASENAMES = avconv avplay avprobe avserver
+ALLAVPROGS = $(AVBASENAMES:%=%$(EXESUF))
+
+$(foreach prog,$(ALLAVPROGS),$(eval OBJS-$(prog) += cmdutils.o))
FFLIBS-$(CONFIG_AVDEVICE) += avdevice
FFLIBS-$(CONFIG_AVFILTER) += avfilter
@@ -90,7 +93,7 @@ include $(SRC_PATH)/common.mak
FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS)
-all: $(PROGS)
+all: $(AVPROGS)
$(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
$(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS)
@@ -126,7 +129,7 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
define DOPROG
-OBJS-$(1) += $(1).o cmdutils.o $(EXEOBJS)
+OBJS-$(1) += $(1).o $(EXEOBJS)
$(1)$(EXESUF): $$(OBJS-$(1))
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
@@ -156,7 +159,7 @@ version.h .version:
# force version.sh to run whenever version might have changed
-include .version
-ifdef PROGS
+ifdef AVPROGS
install: install-progs install-data
endif
@@ -167,9 +170,9 @@ install-libs: install-libs-yes
install-progs-yes:
install-progs-$(CONFIG_SHARED): install-libs
-install-progs: install-progs-yes $(PROGS)
+install-progs: install-progs-yes $(AVPROGS)
$(Q)mkdir -p "$(BINDIR)"
- $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
+ $(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)"
install-data: $(DATA_FILES)
$(Q)mkdir -p "$(DATADIR)"
@@ -178,13 +181,13 @@ install-data: $(DATA_FILES)
uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
uninstall-progs:
- $(RM) $(addprefix "$(BINDIR)/", $(ALLPROGS))
+ $(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS))
uninstall-data:
$(RM) -r "$(DATADIR)"
clean::
- $(RM) $(ALLPROGS)
+ $(RM) $(ALLAVPROGS)
$(RM) $(CLEANSUFFIXES)
$(RM) $(CLEANSUFFIXES:%=tools/%)
$(RM) -rf coverage.info lcov
diff --git a/doc/Makefile b/doc/Makefile
index b76772b..47063bd 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,7 @@
-MANPAGES = $(PROGS-yes:%=doc/%.1)
-PODPAGES = $(PROGS-yes:%=doc/%.pod)
-HTMLPAGES = $(PROGS-yes:%=doc/%.html) \
+ALLMANPAGES = $(AVBASENAMES:%=%.1)
+MANPAGES = $(AVPROGS-yes:%=doc/%.1)
+PODPAGES = $(AVPROGS-yes:%=doc/%.pod)
+HTMLPAGES = $(AVPROGS-yes:%=doc/%.html) \
doc/developer.html \
doc/faq.html \
doc/fate.html \
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
