Improved Makefile.

This commit is contained in:
Thulinma 2014-01-06 18:26:00 +01:00
parent 453d3ac885
commit b3eb9d8f10
2 changed files with 35 additions and 34 deletions

1
.gitignore vendored
View file

@ -19,6 +19,7 @@ autom4te.cache
/ltmain.sh /ltmain.sh
/missing /missing
/depcomp /depcomp
/sourcery
.libs .libs
VERSION VERSION
.dep.inc .dep.inc

View file

@ -28,137 +28,137 @@ endif
controller: MistController controller: MistController
MistController: src/controller/server.html.h src/controller/* MistController: src/controller/server.html.h src/controller/*
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/controller/*.cpp $(CXX) $(LDFLAGS) $(CPPFLAGS) src/controller/*.cpp $(LDLIBS) -o $@
buffers: MistPlayer buffers: MistPlayer
MistPlayer: src/buffer/player.cpp MistPlayer: src/buffer/player.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
buffers: MistBuffer buffers: MistBuffer
MistBuffer: LDLIBS += -lpthread MistBuffer: LDLIBS += -lpthread
MistBuffer: src/buffer/buffer.cpp src/buffer/buffer_stream.h src/buffer/buffer_stream.cpp tinythread.o tinythread.h MistBuffer: src/buffer/buffer.cpp src/buffer/buffer_stream.h src/buffer/buffer_stream.cpp tinythread.o tinythread.h
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/buffer/buffer.cpp src/buffer/buffer_stream.cpp tinythread.o $(CXX) $(LDFLAGS) $(CPPFLAGS) src/buffer/buffer.cpp src/buffer/buffer_stream.cpp tinythread.o $(LDLIBS) -o $@
connectors: MistConnRaw connectors: MistConnRaw
MistConnRaw: src/connectors/conn_raw.cpp MistConnRaw: src/connectors/conn_raw.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnRTMP connectors: MistConnRTMP
MistConnRTMP: src/connectors/conn_rtmp.cpp MistConnRTMP: src/connectors/conn_rtmp.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTP connectors: MistConnHTTP
MistConnHTTP: LDLIBS += -lpthread MistConnHTTP: LDLIBS += -lpthread
MistConnHTTP: src/connectors/conn_http.cpp tinythread.o tinythread.h src/connectors/embed.js.h src/connectors/icon.h MistConnHTTP: src/connectors/conn_http.cpp tinythread.o tinythread.h src/connectors/embed.js.h src/connectors/icon.h
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/connectors/conn_http.cpp tinythread.o $(CXX) $(LDFLAGS) $(CPPFLAGS) src/connectors/conn_http.cpp tinythread.o $(LDLIBS) -o $@
connectors: MistConnHTTPProgressiveFLV connectors: MistConnHTTPProgressiveFLV
MistConnHTTPProgressiveFLV: src/connectors/conn_http_progressive_flv.cpp MistConnHTTPProgressiveFLV: src/connectors/conn_http_progressive_flv.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTPProgressiveMP3 connectors: MistConnHTTPProgressiveMP3
MistConnHTTPProgressiveMP3: src/connectors/conn_http_progressive_mp3.cpp MistConnHTTPProgressiveMP3: src/connectors/conn_http_progressive_mp3.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTPProgressiveMP4 connectors: MistConnHTTPProgressiveMP4
MistConnHTTPProgressiveMP4: src/connectors/conn_http_progressive_mp4.cpp MistConnHTTPProgressiveMP4: src/connectors/conn_http_progressive_mp4.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTPProgressiveOGG connectors: MistConnHTTPProgressiveOGG
MistConnHTTPProgressiveOGG: src/connectors/conn_http_progressive_ogg.cpp MistConnHTTPProgressiveOGG: src/connectors/conn_http_progressive_ogg.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTPDynamic connectors: MistConnHTTPDynamic
MistConnHTTPDynamic: src/connectors/conn_http_dynamic.cpp MistConnHTTPDynamic: src/connectors/conn_http_dynamic.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTPSmooth connectors: MistConnHTTPSmooth
MistConnHTTPSmooth: src/connectors/conn_http_smooth.cpp src/connectors/xap.h MistConnHTTPSmooth: src/connectors/conn_http_smooth.cpp src/connectors/xap.h
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/connectors/conn_http_smooth.cpp $(CXX) $(LDFLAGS) $(CPPFLAGS) $< $(LDLIBS) -o $@
connectors: MistConnHTTPLive connectors: MistConnHTTPLive
MistConnHTTPLive: src/connectors/conn_http_live.cpp MistConnHTTPLive: src/connectors/conn_http_live.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTPSRT connectors: MistConnHTTPSRT
MistConnHTTPSRT: src/connectors/conn_http_srt.cpp MistConnHTTPSRT: src/connectors/conn_http_srt.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnHTTPJSON connectors: MistConnHTTPJSON
MistConnHTTPJSON: src/connectors/conn_http_json.cpp MistConnHTTPJSON: src/connectors/conn_http_json.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
connectors: MistConnTS connectors: MistConnTS
MistConnTS: src/connectors/conn_ts.cpp MistConnTS: src/connectors/conn_ts.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
analysers: MistAnalyserRTMP analysers: MistAnalyserRTMP
MistAnalyserRTMP: src/analysers/rtmp_analyser.cpp MistAnalyserRTMP: src/analysers/rtmp_analyser.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
analysers: MistAnalyserFLV analysers: MistAnalyserFLV
MistAnalyserFLV: src/analysers/flv_analyser.cpp MistAnalyserFLV: src/analysers/flv_analyser.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
analysers: MistAnalyserDTSC analysers: MistAnalyserDTSC
MistAnalyserDTSC: src/analysers/dtsc_analyser.cpp MistAnalyserDTSC: src/analysers/dtsc_analyser.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
analysers: MistAnalyserAMF analysers: MistAnalyserAMF
MistAnalyserAMF: src/analysers/amf_analyser.cpp MistAnalyserAMF: src/analysers/amf_analyser.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
analysers: MistAnalyserMP4 analysers: MistAnalyserMP4
MistAnalyserMP4: src/analysers/mp4_analyser.cpp MistAnalyserMP4: src/analysers/mp4_analyser.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
analysers: MistAnalyserOGG analysers: MistAnalyserOGG
MistAnalyserOGG: src/analysers/ogg_analyser.cpp MistAnalyserOGG: src/analysers/ogg_analyser.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
analysers: MistInfo analysers: MistInfo
MistInfo: src/analysers/info.cpp MistInfo: src/analysers/info.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistDTSC2FLV converters: MistDTSC2FLV
MistDTSC2FLV: src/converters/dtsc2flv.cpp MistDTSC2FLV: src/converters/dtsc2flv.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistFLV2DTSC converters: MistFLV2DTSC
MistFLV2DTSC: src/converters/flv2dtsc.cpp MistFLV2DTSC: src/converters/flv2dtsc.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistOGG2DTSC converters: MistOGG2DTSC
MistOGG2DTSC: src/converters/ogg2dtsc.cpp MistOGG2DTSC: src/converters/ogg2dtsc.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistDTSC2OGG converters: MistDTSC2OGG
MistDTSC2OGG: src/converters/dtsc2ogg.cpp MistDTSC2OGG: src/converters/dtsc2ogg.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistDTSCFix converters: MistDTSCFix
MistDTSCFix: src/converters/dtscfix.cpp MistDTSCFix: src/converters/dtscfix.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistDTSCMerge converters: MistDTSCMerge
MistDTSCMerge: src/converters/dtscmerge.cpp MistDTSCMerge: src/converters/dtscmerge.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistDTSC2TS converters: MistDTSC2TS
MistDTSC2TS: src/converters/dtsc2ts.cpp MistDTSC2TS: src/converters/dtsc2ts.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistSRT2DTSC converters: MistSRT2DTSC
MistSRT2DTSC: src/converters/srt2dtsc.cpp MistSRT2DTSC: src/converters/srt2dtsc.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistDTSC2SRT converters: MistDTSC2SRT
MistDTSC2SRT: src/converters/dtsc2srt.cpp MistDTSC2SRT: src/converters/dtsc2srt.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
converters: MistDTSC2MP4 converters: MistDTSC2MP4
MistDTSC2MP4: src/converters/dtsc2mp4.cpp MistDTSC2MP4: src/converters/dtsc2mp4.cpp
$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^ $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
BUILT_SOURCES=controller/server.html.h connectors/embed.js.h BUILT_SOURCES=controller/server.html.h connectors/embed.js.h
lspSOURCES=lsp/jquery.js lsp/placeholder.js lsp/md5.js lsp/main.js lsp/pages.js lsp/tablesort.js lspSOURCES=lsp/jquery.js lsp/placeholder.js lsp/md5.js lsp/main.js lsp/pages.js lsp/tablesort.js
@ -196,7 +196,7 @@ docs: src/* Doxyfile
doxygen ./Doxyfile > /dev/null doxygen ./Doxyfile > /dev/null
clean: clean:
rm -f *.o Mist* src/controller/server.html src/connectors/embed.js.h src/controller/server.html.h rm -f *.o Mist* sourcery src/controller/server.html src/connectors/embed.js.h src/controller/server.html.h
rm -rf ./docs rm -rf ./docs
install: controller buffers connectors analysers converters install: controller buffers connectors analysers converters