Update makefile to GIT command
authorHenning Rogge <hrogge@googlemail.com>
Mon, 16 Nov 2009 18:53:47 +0000 (19:53 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 16 Nov 2009 18:53:47 +0000 (19:53 +0100)
.gitignore [new file with mode: 0644]
Makefile

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..97e84de
--- /dev/null
@@ -0,0 +1,48 @@
+# git-ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+*.o
+*.a
+*.d
+*.diff
+*.rej
+*.orig
+*.swp
+*~
+*.out.*
+*-backup
+TAGS
+olsrd
+config-verify
+netsimpcap
+src/builddata.c
+lib/*/*so.*.*
+*.obj
+*.lib
+*.dll
+olsrd.exe
+olsr-setup.exe
+olsrd.exports
+*.opt
+*.ncb
+*.aps
+*.sbr
+*.plg
+gui/win32/Main/Debug/
+gui/win32/Main/Release/
+gui/win32/Shim/Debug/
+gui/win32/Shim/Release/
+#*#
+.#*
+*.flc
+redhat/olsrd.spec
+files/index.html
+files/olsrd_8.html
+files/olsrd_conf_5.html
+files/olsr_switch_8.html
+files/olsrd_metrics_3.html
+files/olsrd-history.5
+contrib/txtinfoshell/txtinfo-sh
index 24793d0..d32dd95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ show-ignored-warnings:
 src/builddata.c:
        @$(RM) "$@"
        @echo "#include \"defs.h\"" >> "$@"
-       @echo "const char olsrd_version[] = \"olsr.org - $(VERS)`hg log -r tip|grep -E "^changeset:"|sed -e s/changeset:\ */\ changeset\ /`\";"  >> "$@"
+       @echo "const char olsrd_version[] = \"olsr.org - $(VERS)-`git log -1 --pretty=%h`\";"  >> "$@"
        @date +"const char build_date[] = \"%Y-%m-%d %H:%M:%S\";" >> "$@"
        @echo "const char build_host[] = \"$(shell hostname)\";" >> "$@"