Revision 57fb780f

View differences:

.gitmodules
13 13
[submodule "THIRDPARTY-LIBS/x264"]
14 14
	path = THIRDPARTY-LIBS/x264
15 15
	url = git://git.videolan.org/x264.git
16
[submodule "ChunkerPlayer"]
17
	path = ChunkerPlayer
18
	url = git://halo.disi.unitn.it/cskiraly/ChunkerPlayer.git
ChunkerPlayer
1
Subproject commit fe6a7fcdd91c564bd6d0cd067173cebc1c94f8dc
Makefile
5 5

  
6 6
all: Streamers/streamer-grapes
7 7
ml: Streamers/streamer-ml-monl-grapes-static
8
chunkstream: Streamers/streamer-chunkstream
8
chunkstream: Streamers/streamer-chunkstream ChunkerPlayer/chunker_player/chunker_player
9 9

  
10 10
$(THIRDPARTYLIBS):
11 11
	$(MAKE) -C $(THIRDPARTYLIBS) || { echo "Error preparing third party libs" && exit 1; }
......
27 27
Streamers/streamer-chunkstream: Streamers/.git $(THIRDPARTYLIBS)
28 28
	IO=chunkstream GRAPES=$(THIRDPARTYLIBS)/GRAPES FFMPEG_DIR=$(THIRDPARTYLIBS)/ffmpeg X264_DIR=$(THIRDPARTYLIBS)/x264 $(MAKE) -C Streamers  || { echo "Error compiling the Streamer" && exit 1; }
29 29

  
30
ChunkerPlayer/.git:
31
	git submodule update --init -- $(shell dirname $@)
32

  
33
ChunkerPlayer/chunker_player/chunker_player: ChunkerPlayer/.git
34
	cd ChunkerPlayer && ./build_ul.sh
35

  
30 36
prepare:
31 37
	git submodule update --init
32 38

  

Also available in: Unified diff