Revision d74bb0e5 Makefile

View differences:

Makefile
37 37
LDLIBS = -ltrading -lcb -ltopman
38 38
endif
39 39

  
40
OBJS = dumbstreamer.o streaming.o output.o net_helpers.o input.o out-stream.o
40
OBJS = dumbstreamer.o streaming.o output.o net_helpers.o input.o
41 41
ifdef THREADS
42 42
OBJS += loop-mt.o
43 43
CFLAGS += -pthread
......
48 48

  
49 49
ifdef FFDIR
50 50
FFSRC ?= $(FFDIR)
51
OBJS += Chunkiser/input-stream-avs.o
51
OBJS += Chunkiser/input-stream-avs.o out-stream-avf.o
52 52
LDFLAGS += -L$(FFDIR)/libavcodec -L$(FFDIR)/libavformat -L$(FFDIR)/libavutil
53 53
LDLIBS += -lavformat -lavcodec -lavutil
54 54
LDLIBS += -lm
55 55
LDLIBS += $(call ld-option, -lz)
56 56
LDLIBS += $(call ld-option, -lbz2)
57 57
else
58
OBJS += input-stream-dummy.o
58
OBJS += input-stream-dummy.o out-stream.o
59 59
endif
60 60

  
61 61
EXECTARGET = dumbstreamer
......
71 71
$(EXECTARGET): $(OBJS) $(GRAPES)/som/Tests/net_helper-ml.o $(GRAPES)/som/Tests/ml_helpers.o
72 72
endif
73 73

  
74
Chunkiser/input-stream-avs.o: CPPFLAGS += -I$(FFSRC) 
74
out-stream-avf.o Chunkiser/input-stream-avs.o: CPPFLAGS += -I$(FFSRC) 
75 75

  
76 76
GRAPES:
77 77
	git clone http://www.disi.unitn.it/~abeni/PublicGits/GRAPES.git

Also available in: Unified diff