diff --git a/.gitignore b/.gitignore index cc9ca894..f34fdcc5 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,9 @@ src/converters/Mist* /depcomp .libs VERSION +.dep.inc +autoscan.log +libtool +*.dtsc +*.flv +*.json diff --git a/createhooks.sh b/createhooks.sh new file mode 100755 index 00000000..067aafa8 --- /dev/null +++ b/createhooks.sh @@ -0,0 +1,8 @@ +#!/bin/bash +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +echo -e "#!/bin/bash\n[ -f configure ] && touch configure\n[ -f configure.ac ] && touch configure.ac" > $DIR/.git/hooks/post-commit +echo -e "#!/bin/bash\n[ -f configure ] && touch configure\n[ -f configure.ac ] && touch configure.ac" > $DIR/.git/hooks/post-checkout +chmod +x $DIR/.git/hooks/post-commit +chmod +x $DIR/.git/hooks/post-checkout +echo "Done! The version number should now auto-update whenever you commit or checkout." + diff --git a/src/Makefile.am b/src/Makefile.am index 5dd5113b..e1c6b4ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS=converters analysers bin_PROGRAMS=MistBuffer MistController MistConnRAW MistConnRTMP MistConnHTTP -MistBuffer_SOURCES=buffer.cpp buffer_user.h buffer_user.cpp buffer_stream.h buffer_stream.cpp +MistBuffer_SOURCES=buffer.cpp buffer_user.h buffer_user.cpp buffer_stream.h buffer_stream.cpp ../VERSION MistBuffer_LDADD=../lib/libjson.la ../lib/libsocket.la ../lib/libdtsc.la ../lib/libtinythread.la -MistController_SOURCES=controller.cpp +MistController_SOURCES=controller.cpp ../VERSION MistController_LDADD=../lib/libjson.la ../lib/libsocket.la ../lib/libprocs.la ../lib/libconfig.la ../lib/libhttp_parser.la ../lib/libauth.la ../lib/libbase64.la -MistConnRAW_SOURCES=conn_raw.cpp +MistConnRAW_SOURCES=conn_raw.cpp ../VERSION MistConnRAW_LDADD=../lib/libsocket.la -MistConnRTMP_SOURCES=conn_rtmp.cpp server_setup.h +MistConnRTMP_SOURCES=conn_rtmp.cpp server_setup.h ../VERSION MistConnRTMP_LDADD=../lib/libdtsc.la ../lib/librtmpchunks.la ../lib/libconfig.la -MistConnHTTP_SOURCES=conn_http.cpp server_setup.h +MistConnHTTP_SOURCES=conn_http.cpp server_setup.h ../VERSION MistConnHTTP_LDADD=../lib/libdtsc.la ../lib/libflv_tag.la ../lib/libjson.la ../lib/libhttp_parser.la ../lib/libmp4.la ../lib/libprocs.la ../lib/libbase64.la ../lib/libconfig.la