diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | common.mak | 14 | ||||
| -rw-r--r-- | subdir.mak | 35 |
3 files changed, 35 insertions, 20 deletions
@@ -104,15 +104,15 @@ doc/%.1: doc/%.pod install: $(INSTALL_TARGETS-yes) install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) - mkdir -p "$(BINDIR)" + $(Q)mkdir -p "$(BINDIR)" $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)" install-data: $(DATA_FILES) - mkdir -p "$(DATADIR)" + $(Q)mkdir -p "$(DATADIR)" $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)" install-man: $(MANPAGES) - mkdir -p "$(MANDIR)/man1" + $(Q)mkdir -p "$(MANDIR)/man1" $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1" uninstall: uninstall-progs uninstall-data uninstall-man diff --git a/common.mak b/common.mak index 5420c7d9fb..c9e862f37a 100644 --- a/common.mak +++ b/common.mak @@ -17,6 +17,18 @@ else BUILD_ROOT_REL = .. endif +ifndef V +Q = @ +ECHO = printf "$(1)\t%s\n" $(2) +BRIEF = CC AS YASM AR LD HOSTCC RANLIB STRIP CP +SILENT = CCDEP ASDEP YASMDEP RM +MSG = $@ +$(foreach VAR,$(BRIEF), \ + $(eval $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR)))) +$(foreach VAR,$(SILENT),$(eval $(VAR) = @$($(VAR)))) +$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL)) +endif + ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS) @@ -36,7 +48,7 @@ CFLAGS += $(ECFLAGS) %$(EXESUF): %.c %.ver: %.v - sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@ + $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@ SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES)) diff --git a/subdir.mak b/subdir.mak index 9302722eae..9d818885c8 100644 --- a/subdir.mak +++ b/subdir.mak @@ -23,17 +23,17 @@ THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) define RULES $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o - $(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)%-test.o: $(SUBDIR)%.c - $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^ + $$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^ $(SUBDIR)%-test.o: $(SUBDIR)%-test.c - $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^ + $$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm - $(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d) - $(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$< + $$(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d) + $$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$< clean:: $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ @@ -50,11 +50,11 @@ all: $(SUBDIR)$(SLIBNAME) install-libs: install-lib$(NAME)-shared $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) - cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) + $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_CMD) - $(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) + $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) ifdef SUBDIR @@ -63,26 +63,29 @@ endif endif install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) - mkdir -p "$(SHLIBDIR)" + $(Q)mkdir -p "$(SHLIBDIR)" $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" - $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" - cd "$(SHLIBDIR)" && \ + $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" + $(Q)cd "$(SHLIBDIR)" && \ $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) - cd "$(SHLIBDIR)" && \ + $(Q)cd "$(SHLIBDIR)" && \ $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME) - $(SLIB_INSTALL_EXTRA_CMD) + $$(SLIB_INSTALL_EXTRA_CMD) + +install-lib$(NAME)-static: MSG = $(LIBDIR)/$(LIBNAME) +install-lib$(NAME)-shared: MSG = $(LIBDIR)/$(SLIBNAME) install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME) - mkdir -p "$(LIBDIR)" + $(Q)mkdir -p "$(LIBDIR)" $$(INSTALL) -m 644 $$< "$(LIBDIR)" - $(LIB_INSTALL_EXTRA_CMD) + $$(LIB_INSTALL_EXTRA_CMD) install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS)) - mkdir -p "$(INCINSTDIR)" + $(Q)mkdir -p "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc - mkdir -p "$(LIBDIR)/pkgconfig" + $(Q)mkdir -p "$(LIBDIR)/pkgconfig" $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" uninstall-libs:: |