shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I4e32a8fb,Ic6a9d4c5

* changes:
  Generate a vpx.pc file for pkg-config.
  Export the version string as a makefile variable.

--- a/configure

+++ b/configure

@@ -377,6 +377,7 @@

     if [ -f "${source_path}/build/make/version.sh" ]; then

         local ver=`"$source_path/build/make/version.sh" --bare $source_path`

         DIST_DIR="${DIST_DIR}-${ver}"

+        VERSION_STRING=${ver}

         ver=${ver%%-*}

         VERSION_PATCH=${ver##*.}

         ver=${ver%.*}

@@ -385,6 +386,8 @@

         VERSION_MAJOR=${ver%.*}

     fi

     enabled child || cat <<EOF >> config.mk

+

+PREFIX=${prefix}

 ifeq (\$(MAKECMDGOALS),dist)

 DIST_DIR?=${DIST_DIR}

 else

@@ -391,6 +394,8 @@

 DIST_DIR?=\$(DESTDIR)${prefix}

 endif

 LIBSUBDIR=${libdir##${prefix}/}

+

+VERSION_STRING=${VERSION_STRING}

 VERSION_MAJOR=${VERSION_MAJOR}

 VERSION_MINOR=${VERSION_MINOR}

--- a/libs.mk

+++ b/libs.mk

@@ -204,6 +204,26 @@

 INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS)

 INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)

+

+LIBS-$(BUILD_LIBVPX) += vpx.pc

+vpx.pc: config.mk libs.mk

+	@echo "    [CREATE] $@"

+	$(qexec)echo '# pkg-config file from libvpx $(VERSION_STRING)' > $@

+	$(qexec)echo 'prefix=$(PREFIX)' >> $@

+	$(qexec)echo 'exec_prefix=$${prefix}' >> $@

+	$(qexec)echo 'libdir=$${prefix}/lib' >> $@

+	$(qexec)echo 'includedir=$${prefix}/include' >> $@

+	$(qexec)echo '' >> $@

+	$(qexec)echo 'Name: vpx' >> $@

+	$(qexec)echo 'Description: WebM Project VPx codec implementation' >> $@

+	$(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@

+	$(qexec)echo 'Requires:' >> $@

+	$(qexec)echo 'Conflicts:' >> $@

+	$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@

+	$(qexec)echo 'Cflags: -I$${includedir}' >> $@

+INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc

+INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc

+CLEAN-OBJS += vpx.pc

 endif

 LIBS-$(LIPO_LIBVPX) += libvpx.a

-- 

⑨