Generate pkg-config files in each library subdirectory so that they do
authorDiego Biurrun <diego@biurrun.de>
Mon, 16 Jun 2008 18:01:55 +0000 (18:01 +0000)
committerDiego Biurrun <diego@biurrun.de>
Mon, 16 Jun 2008 18:01:55 +0000 (18:01 +0000)
not clutter the root of the source tree.

Originally committed as revision 13780 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
common.mak
configure
subdir.mak

index b1f3cbc..c290f0b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ clean::
        rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
 
 distclean::
-       rm -f version.h config.* *.pc vhook/*.d
+       rm -f version.h config.* vhook/*.d
 
 # regression tests
 
index 88a816e..e77d960 100644 (file)
@@ -68,7 +68,7 @@ depend dep: $(DEPS)
 
 CLEANSUFFIXES = *.o *~ *.ho
 LIBSUFFIXES   = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
-DISTCLEANSUFFIXES = *.d
+DISTCLEANSUFFIXES = *.d *.pc
 
 define RULES
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
index 7c01c4d..c8e701b 100755 (executable)
--- a/configure
+++ b/configure
@@ -2192,7 +2192,7 @@ comment=$2
 version=$3
 libs=$4
 requires=$5
-cat <<EOF > $name.pc
+cat <<EOF > $name/$name.pc
 prefix=$prefix
 exec_prefix=\${prefix}
 libdir=$libdir
@@ -2208,7 +2208,7 @@ Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
 Libs.private: $(enabled shared && echo $libs)
 Cflags: -I\${includedir}
 EOF
-cat <<EOF > $name-uninstalled.pc
+cat <<EOF > $name/$name-uninstalled.pc
 prefix=
 exec_prefix=
 libdir=\${pcfiledir}/$name
@@ -2236,5 +2236,5 @@ if enabled swscale; then
     pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
 else
     pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
-    apply libswscale.pc sed s/^Libs:.*$/Libs:/
+    apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/
 fi
index 68850c8..7c38b77 100644 (file)
@@ -56,7 +56,7 @@ install-headers::
        install -d "$(INCINSTDIR)"
        install -d "$(LIBDIR)/pkgconfig"
        install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
-       install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
+       install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 
 uninstall-libs::
        -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \