Browse Source

Merge commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c'

* commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c':
  build: Add missing config.sh dependency for pkg-config files

Merged-by: James Almer <jamrial@gmail.com>
tags/n4.0
James Almer 7 years ago
parent
commit
ccf7bca1c9
2 changed files with 4 additions and 2 deletions
  1. +3
    -1
      configure
  2. +1
    -1
      ffbuild/library.mak

+ 3
- 1
configure View File

@@ -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

+ 1
- 1
ffbuild/library.mak View File

@@ -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)


Loading…
Cancel
Save