aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2017-11-06 17:57:25 +0100
committerDiego Biurrun <diego@biurrun.de>2017-11-09 15:22:03 +0100
commit17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c (patch)
treeafff212d863bcf0f5ea8a0e0d1340abe0f1fd848
parent7ebe7e8e7a76c0ce302f4f583ef0d14220031214 (diff)
downloadffmpeg-17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c.tar.gz
build: Add missing config.sh dependency for pkg-config files
Also only update config.sh when it changed to avoid spurious rebuilds.
-rw-r--r--avbuild/library.mak2
-rwxr-xr-xconfigure4
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