virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

ln is not available on all platforms, so introduce a variable for it

Browse Source 
that can be set to a suitable platform-specific command.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 10503 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Dave Yeo 2007-09-15 11:09:30 +00:00 committed by Diego Biurrun
parent 2a898132a2
commit 2036977325
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.mak
View File

@ -27,7 +27,7 @@ $(LIB): $(STATIC_OBJS)
$(RANLIB) $@ $(RANLIB) $@
$(SLIBNAME): $(SLIBNAME_WITH_MAJOR) $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
ln -sf $^ $@ $(LN_S) $^ $@
$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
@ -74,9 +74,9 @@ install-lib-shared: $(SLIBNAME)
install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
cd "$(SHLIBDIR)" && \ cd "$(SHLIBDIR)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
cd "$(SHLIBDIR)" && \ cd "$(SHLIBDIR)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME) $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
$(SLIB_INSTALL_EXTRA_CMD) $(SLIB_INSTALL_EXTRA_CMD)
install-lib-static: $(LIB) install-lib-static: $(LIB)

5
configure vendored
View File

@ -835,6 +835,7 @@ ranlib="ranlib"
make="make" make="make"
strip="strip" strip="strip"
asmalign_pot="unknown" asmalign_pot="unknown"
ln_s="ln -sf"
# machine # machine
arch=`uname -m` arch=`uname -m`
@ -1219,6 +1220,7 @@ cc="${cross_prefix}${cc}"
ar="${cross_prefix}${ar}" ar="${cross_prefix}${ar}"
ranlib="${cross_prefix}${ranlib}" ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}" strip="${cross_prefix}${strip}"
ln_s="${cross_prefix}${ln_s}"
# we need to build at least one lib type # we need to build at least one lib type
if ! enabled_any static shared; then if ! enabled_any static shared; then
@ -1879,6 +1881,7 @@ echo "MAKE=$make" >> config.mak
echo "CC=$cc" >> config.mak echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak echo "RANLIB=$ranlib" >> config.mak
echo "LN_S=$ln_s" >> config.mak
if enabled dostrip; then if enabled dostrip; then
echo "STRIP=$strip" >> config.mak echo "STRIP=$strip" >> config.mak
else else
@ -2022,7 +2025,7 @@ if enabled source_path_used; then
mkdir -p $dir mkdir -p $dir
done done
for f in $FILES ; do for f in $FILES ; do
ln -sf "$source_path/$f" $f $ln_s "$source_path/$f" $f
done done
fi fi