Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 6d44da10ada82bff3cc9cb4f6e4ab9e24722abb3)
+++ libcfa/src/Makefile.am	(revision 27258829bc7b31512d549c8678b4e54c47b02cf4)
@@ -38,15 +38,12 @@
 #----------------------------------------------------------------------------------------------------------------
 if BUILDLIB
+headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
 	  containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
-headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
-
 # not all platforms support concurrency, add option do disable it
+headers_nosrc += concurrency/invoke.h
 headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
 
-headers_nosrc += concurrency/invoke.h
-
-libobjs = ${headers:.hfa=.lo}
 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
 
@@ -77,11 +74,15 @@
 -include $(libdeps)
 
-prelude.lo : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
 	${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
 
+prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
+	@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
 
 
 #----------------------------------------------------------------------------------------------------------------
 libcfa_la_SOURCES = prelude.cfa ${libsrc}
+libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
 
 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 6d44da10ada82bff3cc9cb4f6e4ab9e24722abb3)
+++ libcfa/src/Makefile.in	(revision 27258829bc7b31512d549c8678b4e54c47b02cf4)
@@ -135,34 +135,7 @@
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"
-<<<<<<< HEAD
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libcfa_la_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 = fstream.lo iostream.lo iterator.lo limits.lo \
-	rational.lo time.lo stdlib.lo common.lo containers/maybe.lo \
-	containers/pair.lo containers/result.lo containers/vector.lo \
-	concurrency/coroutine.lo concurrency/thread.lo \
-	concurrency/kernel.lo concurrency/monitor.lo \
-	concurrency/mutex.lo
-am__objects_2 = prelude.lo startup.lo interpose.lo bits/debug.lo \
-	assert.lo exception.lo virtual.lo heap.lo $(am__objects_1) \
-	concurrency/CtxSwitch-@ARCHITECTURE@.lo concurrency/alarm.lo \
-	concurrency/invoke.lo concurrency/preemption.lo
-am_libcfa_la_OBJECTS = $(am__objects_2)
-libcfa_la_OBJECTS = $(am_libcfa_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-=======
-LIBRARIES = $(lib_LIBRARIES)
-AR = ar
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR      " $@;
-am__v_AR_1 = 
-libcfa_a_AR = $(AR) $(ARFLAGS)
-libcfa_a_LIBADD =
-am__libcfa_a_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
+am__libcfa_la_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
 	bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
 	fstream.cfa iostream.cfa iterator.cfa limits.cfa rational.cfa \
@@ -175,28 +148,26 @@
 	concurrency/invoke.c concurrency/preemption.cfa
 am__dirstamp = $(am__leading_dot)dirstamp
-@BUILDLIB_TRUE@am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
-@BUILDLIB_TRUE@	iterator.$(OBJEXT) limits.$(OBJEXT) \
-@BUILDLIB_TRUE@	rational.$(OBJEXT) time.$(OBJEXT) \
-@BUILDLIB_TRUE@	stdlib.$(OBJEXT) common.$(OBJEXT) \
-@BUILDLIB_TRUE@	containers/maybe.$(OBJEXT) \
-@BUILDLIB_TRUE@	containers/pair.$(OBJEXT) \
-@BUILDLIB_TRUE@	containers/result.$(OBJEXT) \
-@BUILDLIB_TRUE@	containers/vector.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/coroutine.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/thread.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/kernel.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/monitor.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/mutex.$(OBJEXT)
-@BUILDLIB_TRUE@am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
-@BUILDLIB_TRUE@	bits/debug.$(OBJEXT) assert.$(OBJEXT) \
-@BUILDLIB_TRUE@	exception.$(OBJEXT) virtual.$(OBJEXT) \
-@BUILDLIB_TRUE@	heap.$(OBJEXT) $(am__objects_1) \
-@BUILDLIB_TRUE@	concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/alarm.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/invoke.$(OBJEXT) \
-@BUILDLIB_TRUE@	concurrency/preemption.$(OBJEXT)
-am_libcfa_a_OBJECTS = prelude.$(OBJEXT) $(am__objects_2)
-libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
->>>>>>> master
+@BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
+@BUILDLIB_TRUE@	limits.lo rational.lo time.lo stdlib.lo \
+@BUILDLIB_TRUE@	common.lo containers/maybe.lo \
+@BUILDLIB_TRUE@	containers/pair.lo containers/result.lo \
+@BUILDLIB_TRUE@	containers/vector.lo concurrency/coroutine.lo \
+@BUILDLIB_TRUE@	concurrency/thread.lo concurrency/kernel.lo \
+@BUILDLIB_TRUE@	concurrency/monitor.lo concurrency/mutex.lo
+@BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
+@BUILDLIB_TRUE@	assert.lo exception.lo virtual.lo heap.lo \
+@BUILDLIB_TRUE@	$(am__objects_1) \
+@BUILDLIB_TRUE@	concurrency/CtxSwitch-@ARCHITECTURE@.lo \
+@BUILDLIB_TRUE@	concurrency/alarm.lo concurrency/invoke.lo \
+@BUILDLIB_TRUE@	concurrency/preemption.lo
+am_libcfa_la_OBJECTS = prelude.lo $(am__objects_2)
+libcfa_la_OBJECTS = $(am_libcfa_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libcfa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libcfa_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -243,11 +214,6 @@
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-<<<<<<< HEAD
 SOURCES = $(libcfa_la_SOURCES)
-DIST_SOURCES = $(libcfa_la_SOURCES)
-=======
-SOURCES = $(libcfa_a_SOURCES)
-DIST_SOURCES = $(am__libcfa_a_SOURCES_DIST)
->>>>>>> master
+DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -255,6 +221,6 @@
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__nobase_cfa_include_HEADERS_DIST = ${shell find ${srcdir}/stdhdr \
-	-type f -printf "%p "} fstream.hfa iostream.hfa iterator.hfa \
+am__nobase_cfa_include_HEADERS_DIST = $(shell find $(srcdir)/stdhdr \
+	-type f -printf "%p ") fstream.hfa iostream.hfa iterator.hfa \
 	limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
 	containers/maybe.hfa containers/pair.hfa containers/result.hfa \
@@ -310,4 +276,5 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
+CFA_VERSION = @CFA_VERSION@
 CFLAGS = @CFLAGS@
 CONFIGURATION = @CONFIGURATION@
@@ -429,8 +396,5 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = foreign subdir-objects
-<<<<<<< HEAD
 ACLOCAL_AMFLAGS = -I automake
-=======
->>>>>>> master
 ARFLAGS = cr
 CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -450,34 +414,17 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-<<<<<<< HEAD
-AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
-=======
-AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
-AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
->>>>>>> master
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
+@BUILDLIB_FALSE@headers_nosrc = 
+
+#----------------------------------------------------------------------------------------------------------------
+
+# not all platforms support concurrency, add option do disable it
+@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
+@BUILDLIB_TRUE@	bits/align.hfa bits/containers.hfa \
+@BUILDLIB_TRUE@	bits/defs.hfa bits/debug.hfa bits/locks.hfa \
+@BUILDLIB_TRUE@	concurrency/invoke.h
 @BUILDLIB_FALSE@headers = 
-
-#----------------------------------------------------------------------------------------------------------------
-
-# not all platforms support concurrency, add option do disable it
-<<<<<<< HEAD
-headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa \
-	rational.hfa time.hfa stdlib.hfa common.hfa \
-	containers/maybe.hfa containers/pair.hfa containers/result.hfa \
-	containers/vector.hfa concurrency/coroutine.hfa \
-	concurrency/thread.hfa concurrency/kernel.hfa \
-	concurrency/monitor.hfa concurrency/mutex.hfa
-libobjs = ${headers:.hfa=.lo}
-
-# not all platforms support concurrency, add option do disable it
-libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
-	exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
-	concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
-	concurrency/invoke.c concurrency/preemption.cfa
-libcfa_la_SOURCES = ${libsrc}
-stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
-=======
 @BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
 @BUILDLIB_TRUE@	limits.hfa rational.hfa time.hfa stdlib.hfa \
@@ -487,9 +434,4 @@
 @BUILDLIB_TRUE@	concurrency/thread.hfa concurrency/kernel.hfa \
 @BUILDLIB_TRUE@	concurrency/monitor.hfa concurrency/mutex.hfa
-@BUILDLIB_FALSE@headers_nosrc = 
-@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
-@BUILDLIB_TRUE@	bits/align.hfa bits/containers.hfa \
-@BUILDLIB_TRUE@	bits/defs.hfa bits/debug.hfa bits/locks.hfa \
-@BUILDLIB_TRUE@	concurrency/invoke.h
 @BUILDLIB_FALSE@libsrc = 
 
@@ -507,17 +449,17 @@
 
 # add dependency of cfa files
-libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
+libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
 
 # .deps inclusion is not done automatically by automake for new languages
 libdeps = $(join \
 	$(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
-	$(notdir ${libobjs:.o=.Po}) \
+	$(notdir ${libobjs:.lo=.Po}) \
 )
 
 
 #----------------------------------------------------------------------------------------------------------------
-libcfa_a_SOURCES = prelude.cfa ${libsrc}
-stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
->>>>>>> master
+libcfa_la_SOURCES = prelude.cfa ${libsrc}
+libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
+stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
 cfa_includedir = $(CFA_INCDIR)
 nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
@@ -638,5 +580,5 @@
 
 libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -652,16 +594,8 @@
 	-rm -f *.tab.c
 
-<<<<<<< HEAD
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Plo@am__quote@
-=======
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@
->>>>>>> master
 
 .S.o:
@@ -969,21 +903,19 @@
 	$(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 	$(am__mv) $$depbase.Tpo $$depbase.Po
-$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
-
-<<<<<<< HEAD
+
 .cfa.lo:
 	$(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 	$(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 	$(am__mv) $$depbase.Tpo $$depbase.Plo
-
-#----------------------------------------------------------------------------------------------------------------
-# add dependency to cfa-cpp so all libraries are rebuilt with new translator
-${libobjs} : ${cfalib_DATA}
-=======
+$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
+
 -include $(libdeps)
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
 	${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
->>>>>>> master
+
+prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
+	@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------