Merge branch 'master' into devel

Conflicts:

	snippets/linux

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc

diff --git a/Makefile b/Makefile
index c2af4199ed96d5b07d71e1e56157ef0417b9ea16..ef2541eda365d3d33f6f9fdca9c9357ab1d360c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,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

diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644 (file)
index 0000000..9f4f25b
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,16 @@
+.version
+omk-manual.aux
+omk-manual.cp
+omk-manual.cps
+omk-manual.fn
+omk-manual.html
+omk-manual.ky
+omk-manual.log
+omk-manual.pdf
+omk-manual.pg
+omk-manual.toc
+omk-manual.tp
+omk-manual.txt
+omk-manual.vr
+omk-manual.vrs
+

diff --git a/doc/Makefile b/doc/Makefile
index 9f08bcee03338f6f017671e96d57accb07540f1d..7c62e97e7a896fac1ac959b68bdae1bad67b284f 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 SOURCE = omk-manual
-VERSION ?= $(shell date +%Y-%m-%d)
+VERSION:=$(shell git describe|sed -e 's/^v//')
 
 .PHONY: FORCE
 

diff --git a/doc/index.html b/doc/index.html
index 167aad330cb6673c2b793b973e179ce3bc8f343f..24476713d3bf79c3ce2b77ac2d84b7dc5576bb52 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -27,6 +27,7 @@ may do incompatible changes in future.
 <h2>News</h2>
 
 <ul>
+  <li>2008-30-10: OMK repository has been migrated from Darcs to GIT (see bellow).</li>
   <li>2008-04-23: OMK version 0.1 released.</li>
 </ul>
 
@@ -37,14 +38,14 @@ may do incompatible changes in future.
 </ul>
 
 
-OMK can also be downloaded from <a href="http://darcs.net/">Darcs</a>
-repository. To download it, install darcs and run
+OMK can also be downloaded from <a href="http://git.or.cz/">GIT</a>
+repository. To download it, run
 
 <pre>
-darcs get http://rtime.felk.cvut.cz/repos/omk/
+git clone git://rtime.felk.cvut.cz/omk.git
 </pre>
 
-You can also browse <a href="http://rtime.felk.cvut.cz/darcs/darcsweb.cgi?r=omk">OMK repository online</a>.
+You can also browse <a href="http://rtime.felk.cvut.cz/gitweb/omk.git">OMK repository online</a>.
 
 <h2>Documentation</h2>
 

diff --git a/snippets/linux b/snippets/linux
index 795a37f739ef901d170eaa34c2cef8e0071876ee..696674e002556bacb1502eadc0644d56d3310390 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -389,7 +389,7 @@ $(1)_shared_libs = $$(patsubst %,$(USER_LIB_DIR)/lib%.$(SOLIB_EXT),$$(filter $$(
 #$$(warning $(1)_shared_libs = $$($(1)_shared_libs))
 $(USER_LIB_DIR)/lib$(1).$(SOLIB_EXT): $$($(1)_shared_libs) $$($(1)_objslo)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
-       $(Q)LD_RUN_PATH=$(USER_LIB_DIR) $(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -o $$@ $$($(1)_objslo) $$(LOADLIBES) $$($(1)_libs:%=-l%)
+       $(Q)$(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -o $$@ $$($(1)_objslo) $$(LOADLIBES) $$($(1)_libs:%=-l%)
 endef
 
 # Syntax: $(call program_link_template,<executable-name>,<dest-dir>)

diff --git a/snippets/sources-list b/snippets/sources-list
index 37dbe5e2d008776377d9dc55362b9ce0d2bfde39..c74286596db32b600b47c20f0a5f04acef1b7a55 100644 (file)
--- a/snippets/sources-list
+++ b/snippets/sources-list
@@ -11,13 +11,7 @@ SOURCES_LIST_D := $(LOCAL_BUILD_DIR)/$(SOURCES_LIST_FN).d
 export SOURCES_LIST SOURCES_LIST_DIR SOURCES_LIST_D
 endif
 
-ifeq ($(MAKECMDGOALS),sources-list)
-NEED_SOURCES_LIST=y
-endif
-ifeq ($(MAKECMDGOALS),TAGS)
-NEED_SOURCES_LIST=y
-endif
-ifeq ($(MAKECMDGOALS),tags)
+ifneq ($(filter sources-list TAGS tags cscope,$(MAKECMDGOALS)),)
 NEED_SOURCES_LIST=y
 endif
 

diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644 (file)
index 0000000..a32e200
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+results*.html