summaryrefslogtreecommitdiffstats
path: root/common.mak
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-21 23:28:05 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-21 23:28:05 +0000
commitf7c520b74dc40ddf44f852a36e1c297114101a34 (patch)
tree3dfa073cb4985fbf422aa6270dbc991078ddfbdf /common.mak
parent2e66db0c4a8becb476abba7dbf879b99fa717edc (diff)
downloadmpv-f7c520b74dc40ddf44f852a36e1c297114101a34.tar.bz2
mpv-f7c520b74dc40ddf44f852a36e1c297114101a34.tar.xz
Sync with FFmpeg r7634.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21993 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak5
1 files changed, 1 insertions, 4 deletions
diff --git a/common.mak b/common.mak
index d4a8dca416..9f28b596d3 100644
--- a/common.mak
+++ b/common.mak
@@ -33,10 +33,6 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
%.o: %.S
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
-%.o: %.cpp
- g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
-
%: %.o $(LIB)
$(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
@@ -69,6 +65,7 @@ install-lib-shared: $(SLIBNAME)
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
cd "$(shlibdir)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
+ $(SLIB_INSTALL_EXTRA_CMD)
install-lib-static: $(LIB)
install -d "$(libdir)"