[FFmpeg-cvslog] build: Add missing config.sh dependency for pkg-config files

Diego Biurrun git at videolan.org
Sun Nov 12 06:04:15 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Nov  6 17:57:25 2017 +0100| [17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c] | committer: Diego Biurrun

build: Add missing config.sh dependency for pkg-config files

Also only update config.sh when it changed to avoid spurious rebuilds.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c
---

 avbuild/library.mak | 2 +-
 configure           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/avbuild/library.mak b/avbuild/library.mak
index 98a100dc7e..81778b7ad1 100644
--- a/avbuild/library.mak
+++ b/avbuild/library.mak
@@ -39,7 +39,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
 $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR)
 	$$(M) $$(SRC_PATH)/avbuild/libversion.sh $(NAME) $$< > $$@
 
-$(SUBDIR)lib$(NAME).pc: $(SUBDIR)version.h | $(SUBDIR)
+$(SUBDIR)lib$(NAME).pc: $(SUBDIR)version.h avbuild/config.sh | $(SUBDIR)
 	$$(M) $$(SRC_PATH)/avbuild/pkgconfig_generate.sh $(NAME) "$(DESC)"
 
 $(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)
diff --git a/configure b/configure
index d43bd6ee86..1f220c8bef 100755
--- a/configure
+++ b/configure
@@ -5385,7 +5385,7 @@ print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $
 
 # Settings for pkg-config files
 
-cat > avbuild/config.sh <<EOF
+cat > $TMPH <<EOF
 # Automatically generated by configure - do not modify!
 shared=$shared
 prefix=$prefix
@@ -5407,3 +5407,5 @@ for lib in $LIBRARY_LIST; do
     lib_deps="$(eval echo \$${lib}_deps)"
     echo ${lib}_deps=\"$lib_deps\" >> avbuild/config.sh
 done
+
+cp_if_changed $TMPH avbuild/config.sh



More information about the ffmpeg-cvslog mailing list