har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate pkg-config files in each library subdirectory so that they do

Browse Source 
not clutter the root of the source tree.

Originally committed as revision 13780 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-06-16 18:01:55 +00:00
parent ef3efa0dbc
commit 25cd5cb33c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -164,7 +164,7 @@ clean::
rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
distclean:: distclean::
rm -f version.h config.* *.pc vhook/*.d rm -f version.h config.* vhook/*.d
# regression tests # regression tests

2
common.mak
View File

@ -68,7 +68,7 @@ depend dep: $(DEPS)
CLEANSUFFIXES = *.o *~ *.ho CLEANSUFFIXES = *.o *~ *.ho
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
DISTCLEANSUFFIXES = *.d DISTCLEANSUFFIXES = *.d *.pc
define RULES define RULES
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o

6
configure vendored
View File

@ -2192,7 +2192,7 @@ comment=$2
version=$3 version=$3
libs=$4 libs=$4
requires=$5 requires=$5
cat <<EOF > $name.pc cat <<EOF > $name/$name.pc
prefix=$prefix prefix=$prefix
exec_prefix=\${prefix} exec_prefix=\${prefix}
libdir=$libdir libdir=$libdir
@ -2208,7 +2208,7 @@ Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
Libs.private: $(enabled shared && echo $libs) Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir} Cflags: -I\${includedir}
EOF EOF
cat <<EOF > $name-uninstalled.pc cat <<EOF > $name/$name-uninstalled.pc
prefix= prefix=
exec_prefix= exec_prefix=
libdir=\${pcfiledir}/$name libdir=\${pcfiledir}/$name
@ -2236,5 +2236,5 @@ if enabled swscale; then
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
else else
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" 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 fi

2
subdir.mak
View File

@ -56,7 +56,7 @@ install-headers::
install -d "$(INCINSTDIR)" install -d "$(INCINSTDIR)"
install -d "$(LIBDIR)/pkgconfig" install -d "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)" 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:: uninstall-libs::
-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \