diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-12 01:02:02 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-12 01:02:02 -0300 |
| commit | ccf7bca1c9bb49bcb1542139eb1b6a0febf4d37e (patch) | |
| tree | 025a6216366b3b268515c20c56957d22fec9a779 | |
| parent | e0087a5624117a1d643e2cb433ecc4d536756dda (diff) | |
| parent | 17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c (diff) | |
| download | ffmpeg-ccf7bca1c9bb49bcb1542139eb1b6a0febf4d37e.tar.gz | |
Merge commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c'
* commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c':
build: Add missing config.sh dependency for pkg-config files
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | ffbuild/library.mak | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -6983,7 +6983,7 @@ print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $ # Settings for pkg-config files -cat > ffbuild/config.sh <<EOF +cat > $TMPH <<EOF # Automatically generated by configure - do not modify! shared=$shared build_suffix=$build_suffix @@ -7009,3 +7009,5 @@ for lib in $LIBRARY_LIST; do lib_deps="$(eval echo \$${lib}_deps)" echo ${lib}_deps=\"$lib_deps\" >> ffbuild/config.sh done + +cp_if_changed $TMPH ffbuild/config.sh diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 069079f5e7..612bacb980 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -39,7 +39,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@ -$(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR) +$(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h ffbuild/config.sh | $(SUBDIR) $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" $(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS) |