Browse code

Shared objects support

Originally committed as revision 194 to svn://svn.ffmpeg.org/ffmpeg/trunk

Nick Kurshev authored on 2001/10/27 21:04:27
Showing 3 changed files
... ...
@@ -18,17 +18,23 @@ EXT=
18 18
 PROG=ffmpeg ffplay ffserver
19 19
 endif
20 20
 
21
+ifeq ($(BUILD_SHARED),yes)
22
+FFMPEG_LIB=-Llibavcodec -lffmpeg
23
+else
24
+FFMPEG_LIB=libavcodec/libavcodec.a
25
+endif
26
+
21 27
 all: lib $(PROG)
22 28
 
23 29
 lib:
24 30
 	$(MAKE) -C libavcodec all
25 31
 	$(MAKE) -C libav all
26 32
 
27
-ffmpeg$(EXE): ffmpeg.o libav/libav.a libavcodec/libavcodec.a
28
-	$(CC) $(LDFLAGS) -o $@ $^ -lm
33
+ffmpeg$(EXE): ffmpeg.o libav/libav.a 
34
+	$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
29 35
 
30
-ffserver$(EXE): ffserver.o libav/libav.a libavcodec/libavcodec.a
31
-	$(CC) $(LDFLAGS) -o $@ $^ -lm
36
+ffserver$(EXE): ffserver.o libav/libav.a 
37
+	$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
32 38
 
33 39
 ffplay: ffmpeg$(EXE)
34 40
 	ln -sf $< $@
... ...
@@ -37,6 +43,7 @@ ffplay: ffmpeg$(EXE)
37 37
 	$(CC) $(CFLAGS) -c -o $@ $< 
38 38
 
39 39
 install: all
40
+	$(MAKE) -C libavcodec install
40 41
 	install -s -m 755 $(PROG) $(prefix)/bin
41 42
 	ln -sf ffmpeg $(prefix)/bin/ffplay 
42 43
 
43 44
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+0.4.5
0 1
\ No newline at end of file
... ...
@@ -39,15 +39,22 @@ endif
39 39
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
40 40
 
41 41
 LIB= libavcodec.a
42
+ifeq ($(BUILD_SHARED),yes)
43
+SLIB= libffmpeg-$(VERSION).so
44
+endif
42 45
 TESTS= imgresample-test dct-test motion-test
43 46
 
44
-all: $(LIB)
47
+all: $(LIB) $(SLIB)
45 48
 tests: apiexample cpuid_test $(TESTS)
46 49
 
47 50
 $(LIB): $(OBJS) $(ASM_OBJS)
48 51
 	rm -f $@
49 52
 	$(AR) rcs $@ $(OBJS) $(ASM_OBJS)
50 53
 
54
+$(SLIB): $(OBJS) $(ASM_OBJS)
55
+	rm -f $@
56
+	$(CC) -shared -o $@ $(OBJS) $(ASM_OBJS)
57
+	ln -sf $@ libffmpeg.so
51 58
 dsputil.o: dsputil.c dsputil.h
52 59
 
53 60
 %.o: %.c
... ...
@@ -63,7 +70,7 @@ depend:
63 63
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
64 64
 
65 65
 clean: 
66
-	rm -f *.o *~ *.a i386/*.o i386/*~ \
66
+	rm -f *.o *~ $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
67 67
 	   armv4l/*.o armv4l/*~ \
68 68
 	   mlib/*.o mlib/*~ \
69 69
            libac3/*.o libac3/*~ \
... ...
@@ -92,6 +99,13 @@ dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o \
92 92
 motion-test: motion_test.o $(LIB)
93 93
 	$(CC) -o $@ $^
94 94
 
95
+install: all
96
+#	install -s -m 644 $(LIB) $(prefix)/lib
97
+ifeq ($(BUILD_SHARED),yes)
98
+	install -s -m 755 $(SLIB) $(prefix)/lib
99
+	ln -sf $(prefix)/lib/$(SLIB) $(prefix)/lib/libffmpeg.so
100
+	ldconfig
101
+endif
95 102
 #
96 103
 # include dependency files if they exist
97 104
 #