Skip to content

Commit

Permalink
build: Add missing config.sh dependency for pkg-config files
Browse files Browse the repository at this point in the history
Also only update config.sh when it changed to avoid spurious rebuilds.
  • Loading branch information
DonDiego committed Nov 9, 2017
1 parent 7ebe7e8 commit 17b6c7e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion avbuild/library.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 17b6c7e

Please sign in to comment.