Revision 5805c339 Makefile

View differences:

Makefile
94 94
LDLIBS += $(call ld-option, -lz)
95 95
LDLIBS += $(call ld-option, -lbz2)
96 96
endif
97
ifeq ($(IO), http)
97
ifeq ($(IO), httpmhd)
98
CPPFLAGS += -DHTTPIO_MHD
98 99
CPPFLAGS += -DHTTPIO
99 100
OBJS += $(ULPLAYER)/chunker_player/chunk_puller.o
100 101
OBJS += $(ULPLAYER)/chunker_streamer/chunk_pusher_curl.o
......
114 115
LDFLAGS += -L$(LOCAL_CURL)/lib
115 116
LDLIBS += $(LOCAL_CURL)/lib/libcurl.a -lrt
116 117
endif
118
ifeq ($(IO), httpevent)
119
CPPFLAGS += -DHTTPIO_EVENT
120
CPPFLAGS += -DHTTPIO
121
OBJS += $(ULPLAYER)/event_http/event_http_server.o
122
#LDFLAGS += -L$(NAPA)/dclog
123
#LDLIBS += -ldclog
124
OBJS += $(ULPLAYER)/chunker_streamer/chunk_pusher_curl.o
125
CPPFLAGS += -I$(ULPLAYER) -I$(ULPLAYER)/chunk_transcoding -I$(ULPLAYER)/event_http
126
OBJS += input-http.o
127
OBJS += output-http.o
128

  
129
#LDFLAGS += -L$(LIBEVENT_DIR)/lib
130
#CPPFLAGS += -I$(LIBEVENT_DIR)/include
131
#LDLIBS += -Wl,-static -levent
132
#LDLIBS += -levent
133

  
134
LOCAL_CURL=$(ULPLAYER)/$(ULPLAYER_EXTERNAL_LIBS)/curl/temp_curl_install
135
CPPFLAGS += -I$(LOCAL_CURL)/include
136
LDFLAGS += -L$(LOCAL_CURL)/lib
137
LDLIBS += $(LOCAL_CURL)/lib/libcurl.a -lrt
138
endif
117 139
ifeq ($(IO), dummy)
118 140
OBJS += input.o
119 141
OBJS += input-stream-dummy.o 
......
188 210
	rm -f $(GRAPES)/src/net_helper.o
189 211
	rm -f *.o
190 212
	rm -f Chunkiser/*.o
213
	rm -f $(ULPLAYER)/chunker_player/chunk_puller.o
214
	rm -f $(ULPLAYER)/chunker_streamer/chunk_pusher_curl.o
215
	rm -f $(ULPLAYER)/event_http/event_http_server.o

Also available in: Unified diff