Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/omk into sssa

[omk/sssa.git] / Makefile

diff --git a/Makefile b/Makefile
index c2af4199ed96d5b07d71e1e56157ef0417b9ea16..4c2f7261a468eb23071a5f8031bc181b806bcd5d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,10 @@
 all: buildrules
 
 buildrules:
-       chmod +x omkbuild.py
-       ./omkbuild.py --all
+       $(MAKE) -C snippets $@
 
 split:
-       chmod +x omkbuild.py
-       cd snippets; ../omkbuild.py --split=../Makefile.rules
+       $(MAKE) -C snippets $@ RULES_TO_SPLIT=../Makefile.rules
 
 test tests:
        $(MAKE) -C tests
@@ -17,7 +15,7 @@ test tests:
 doc:
        $(MAKE) -C doc
 
-VERSION:=$(shell darcs changes --last=1|sed -ne '/tagged/ s/^ *tagged v\(.*\)/\1/p')
+VERSION:=$(shell git describe|sed -e 's/^v//')
 export VERSION                 # Export for doc/
 RELEASE_DIR := omk-$(VERSION)
 release: tag-check doc buildrules