[FFmpeg-cvslog] r13780 - in trunk: . Makefile common.mak configure subdir.mak

[diego]

Author: diego
Date: Mon Jun 16 20:01:55 2008
New Revision: 13780

Log:
Generate pkg-config files in each library subdirectory so that they do
not clutter the root of the source tree.


Modified:
   trunk/   (props changed)
   trunk/Makefile
   trunk/common.mak
   trunk/configure
   trunk/subdir.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Jun 16 20:01:55 2008
@@ -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
 

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Mon Jun 16 20:01:55 2008
@@ -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

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Jun 16 20:01:55 2008
@@ -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} $(disa
 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

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	(original)
+++ trunk/subdir.mak	Mon Jun 16 20:01:55 2008
@@ -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)" \