Revision cf2818b0 Makefile

View differences:

Makefile
54 54

  
55 55
OBJS = ffmpeg.o ffserver.o
56 56
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
57
FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
57 58

  
58 59
all: lib $(PROG) $(VHOOK)
59 60

  
......
61 62
	$(MAKE) -C libavcodec all
62 63
	$(MAKE) -C libavformat all
63 64

  
64
ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
65
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
66
              -lavformat -lavcodec $(EXTRALIBS)
65
ffmpeg_g$(EXE): ffmpeg.o .libs
66
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS)
67 67

  
68 68
ffmpeg$(EXE): ffmpeg_g$(EXE)
69 69
	cp -p $< $@
70 70
	$(STRIP) $@
71 71

  
72
ffserver$(EXE): ffserver.o $(DEP_LIBS)
73
	$(CC) $(LDFLAGS) $(FFSLDFLAGS) \
74
		-o $@ ffserver.o -L./libavcodec -L./libavformat \
75
              -lavformat -lavcodec $(EXTRALIBS) 
72
ffserver$(EXE): ffserver.o .libs
73
	$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
76 74

  
77 75
ffplay: ffmpeg$(EXE)
78 76
	ln -sf $< $@
......
111 109
.depend: $(SRCS)
112 110
	$(CC) -MM $(CFLAGS) $^ 1>.depend
113 111

  
112
.libs: lib
113
	touch .libs
114

  
114 115
clean: $(CLEANVHOOK)
115 116
	$(MAKE) -C libavcodec clean
116 117
	$(MAKE) -C libavformat clean
117 118
	$(MAKE) -C tests clean
118
	rm -f *.o *.d *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
119
	rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
119 120

  
120 121
clean-vhook:
121 122
	$(MAKE) -C vhook clean
......
141 142
	( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
142 143
	rm -rf /tmp/$(FILE)
143 144

  
145
.PHONY: lib
146

  
144 147
ifneq ($(wildcard .depend),)
145 148
include .depend
146 149
endif

Also available in: Unified diff