* Merged in new atomic instructions (twisti branch).

[cacao.git] / src / threads / Makefile.am

diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am
index 844235966110061902f6d272695685714c9cd173..ed23dfe231b3bb994557ad917832d6e33b66446d 100644 (file)
--- a/src/threads/Makefile.am
+++ b/src/threads/Makefile.am
@@ -29,23 +29,39 @@ DIST_SUBDIRS = \
        none \
        posix
 
+if ENABLE_THREADS
 SUBDIRS = \
        posix
 
 THREAD_LIB = \
-       posix/libposix.la
+       posix/libthreadsposix.la
+else
+SUBDIRS = \
+       none
+
+THREAD_LIB = \
+       none/libthreadsnone.la
+endif
+
 
 noinst_LTLIBRARIES = \
        libthreads.la
 
+if ENABLE_THREADS
 libthreads_la_SOURCES = \
-       critical.c \
-       critical.h \
+       atomic.c \
+       atomic.hpp \
+       condition.hpp \
        lock-common.h \
+       removeme.cpp \
+       mutex.hpp \
        threadlist.c \
        threadlist.h \
        thread.c \
        thread.h
+else
+libthreads_la_SOURCES =
+endif
 
 libthreads_la_LIBADD = \
        $(THREAD_LIB)