Browse code

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

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

Diego Biurrun authored on 2008/06/17 03:01:55
Showing 4 changed files
... ...
@@ -164,7 +164,7 @@ clean::
164 164
 	rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
165 165
 
166 166
 distclean::
167
-	rm -f version.h config.* *.pc vhook/*.d
167
+	rm -f version.h config.* vhook/*.d
168 168
 
169 169
 # regression tests
170 170
 
... ...
@@ -68,7 +68,7 @@ depend dep: $(DEPS)
68 68
 
69 69
 CLEANSUFFIXES = *.o *~ *.ho
70 70
 LIBSUFFIXES   = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
71
-DISTCLEANSUFFIXES = *.d
71
+DISTCLEANSUFFIXES = *.d *.pc
72 72
 
73 73
 define RULES
74 74
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
... ...
@@ -2192,7 +2192,7 @@ comment=$2
2192 2192
 version=$3
2193 2193
 libs=$4
2194 2194
 requires=$5
2195
-cat <<EOF > $name.pc
2195
+cat <<EOF > $name/$name.pc
2196 2196
 prefix=$prefix
2197 2197
 exec_prefix=\${prefix}
2198 2198
 libdir=$libdir
... ...
@@ -2208,7 +2208,7 @@ Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
2208 2208
 Libs.private: $(enabled shared && echo $libs)
2209 2209
 Cflags: -I\${includedir}
2210 2210
 EOF
2211
-cat <<EOF > $name-uninstalled.pc
2211
+cat <<EOF > $name/$name-uninstalled.pc
2212 2212
 prefix=
2213 2213
 exec_prefix=
2214 2214
 libdir=\${pcfiledir}/$name
... ...
@@ -2236,5 +2236,5 @@ if enabled swscale; then
2236 2236
     pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
2237 2237
 else
2238 2238
     pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
2239
-    apply libswscale.pc sed s/^Libs:.*$/Libs:/
2239
+    apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/
2240 2240
 fi
... ...
@@ -56,7 +56,7 @@ install-headers::
56 56
 	install -d "$(INCINSTDIR)"
57 57
 	install -d "$(LIBDIR)/pkgconfig"
58 58
 	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
59
-	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
59
+	install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
60 60
 
61 61
 uninstall-libs::
62 62
 	-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \