diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-06-16 18:01:55 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-06-16 18:01:55 +0000 |
| commit | 25cd5cb33ce97f9863d842ec8ecebd60a6043d82 (patch) | |
| tree | 38a0a22529ac707027cca8013de5518f5dd0002f | |
| parent | ef3efa0dbc4049700f76b2923cdeb26b8f652f70 (diff) | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | subdir.mak | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -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 diff --git a/common.mak b/common.mak index 88a816efed..e77d960d9c 100644 --- a/common.mak +++ b/common.mak @@ -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 @@ -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 diff --git a/subdir.mak b/subdir.mak index 68850c80ba..7c38b77619 100644 --- a/subdir.mak +++ b/subdir.mak @@ -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)" \ |