X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fthreads%2FMakefile.am;h=98e8200b3b05e8d660ef9dd5584d5f57ff423da4;hb=86d823b0f0a96d85999b3ffcbaa4a34c7ee6df3f;hp=6ba1d51d8d0d3ed009def30961c466f31d5beb46;hpb=31fc14d3a4cf80754d7586e5d526326de499a1d7;p=cacao.git

diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am
index 6ba1d51d8..98e8200b3 100644
--- a/src/threads/Makefile.am
+++ b/src/threads/Makefile.am
@@ -29,23 +29,48 @@ 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 \
-	lock-common.h \
-	threadlist.c \
-	threadlist.h \
-	threads-common.c \
-	threads-common.h
+	atomic.cpp \
+	atomic.hpp \
+	condition.hpp \
+	lock.cpp \
+	lock.hpp \
+	lockword.cpp \
+	lockword.hpp \
+	removeme.cpp \
+	mutex.hpp \
+	threadlist.cpp \
+	threadlist.hpp \
+	thread-classpath.cpp \
+	thread-classpath.hpp \
+	thread-cldc11.cpp \
+	thread-cldc11.hpp \
+	thread-openjdk.cpp \
+	thread-openjdk.hpp \
+	thread.cpp \
+	thread.hpp
+else
+libthreads_la_SOURCES =
+endif
 
 libthreads_la_LIBADD = \
 	$(THREAD_LIB)