Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/frescor/frsh_forb

author Michal Sojka <sojkam1@fel.cvut.cz>

Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)

committer Michal Sojka <sojkam1@fel.cvut.cz>

Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)
author Michal Sojka <sojkam1@fel.cvut.cz>
Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)
committer Michal Sojka <sojkam1@fel.cvut.cz>
Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)
diff --cc frsh_api/Makefile.omk

index 2977527f6fecfafe1d1f288df1b36a2e05280049,38a02e626505119b19fe550b05f22cb6f9912503..36f17b30928bfba29225474785d1d5f4c7c62f08
--- 1/frsh_api/Makefile.omk
--- 2/frsh_api/Makefile.omk
+++ b/frsh_api/Makefile.omk
@@@ -1,5 -1,6 +1,5 @@@
   shared_LIBRARIES = frsh
- -frsh_SOURCES = frsh_distributed.c
- -#frsh_SOURCES = frsh_contract.c frsh_distributed.c
+ +frsh_SOURCES = frsh_contract.c frsh_distributed.c frsh_core.c
   include_HEADERS = frsh_opaque_types.h
   
- lib_LOADLIBES+= fna
+ frsh_LIBS+= fna
author	Michal Sojka <sojkam1@fel.cvut.cz>
	Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)
committer	Michal Sojka <sojkam1@fel.cvut.cz>
	Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)