summaryrefslogtreecommitdiffstats
path: root/common.mak
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-05 17:12:48 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-05 17:12:48 +0000
commit27f91d06d94d4bbfcaf9ae3281c5c537b4332d3a (patch)
tree714d9cdcbe2d11884eaab57580dc11b77453b0ff /common.mak
parente801f101dfc167b304356e711e868c68050cd4c4 (diff)
downloadmpv-27f91d06d94d4bbfcaf9ae3281c5c537b4332d3a.tar.bz2
mpv-27f91d06d94d4bbfcaf9ae3281c5c537b4332d3a.tar.xz
Sync with FFmpeg r6563.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20074 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak5
1 files changed, 5 insertions, 0 deletions
diff --git a/common.mak b/common.mak
index cc7c7823f4..7ef4693b12 100644
--- a/common.mak
+++ b/common.mak
@@ -10,6 +10,8 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
+EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
$(LIB): $(STATIC_OBJS)
@@ -34,6 +36,9 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
%.o: %.cpp
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
+%: %.o $(LIB)
+ $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
+
depend dep: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend