Revision 74a5d4ae Makefile

View differences:

Makefile
37 37
LDLIBS += -lgrapes
38 38
ifdef ML
39 39
LDFLAGS += -L$(NAPA)/ml -L$(LIBEVENT_DIR)/lib
40
LDLIBS += -lml
40
LDLIBS += -lml -lm
41 41
CPPFLAGS += -I$(NAPA)/ml/include -I$(LIBEVENT_DIR)/include
42 42
ifdef MONL
43 43
LDFLAGS += -L$(NAPA)/dclog -L$(NAPA)/rep -L$(NAPA)/monl -L$(NAPA)/common
44
LDLIBS += -lmon -lrep -ldclog -lcommon
44
LDLIBS += -lstdc++ -lmon -lrep -ldclog -lcommon
45 45
CPPFLAGS += -DMONL
46 46
ifdef STATIC
47 47
CC=g++
48
else
49
LDLIBS_EXTRA = -lm -lstdc++
50 48
endif
51 49
endif
52 50
LDLIBS += -Wl,-static -levent $(if $(STATIC), , -Wl,-Bdynamic) -lrt
53 51
#LDLIBS += -levent -lrt
52
LDLIBS += $(LIBEVENT_DIR)/lib/libevent.a -lrt
54 53
endif
55 54

  
56 55
OBJS += streaming.o
......
86 85
CPPFLAGS += -I$(FFMPEG_DIR)/include
87 86
LDFLAGS += -L$(FFMPEG_DIR)/lib
88 87
LDLIBS += -lavformat -lavcodec -lavutil
89
LDLIBS_EXTRA += -lm
88
LDLIBS += -lm
90 89
LDLIBS += $(call ld-option, -lz)
91 90
LDLIBS += $(call ld-option, -lbz2)
92 91
else
......
111 110
OBJS += input-stream-dummy.o out-stream-dummy.o
112 111
endif
113 112

  
114
LDLIBS += $(LDLIBS_EXTRA)
115

  
116 113
EXECTARGET = offerstreamer
117 114
ifdef ML
118 115
EXECTARGET := $(EXECTARGET)-ml

Also available in: Unified diff