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

diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am
index 1d5ba9664..98e8200b3 100644
--- a/src/threads/Makefile.am
+++ b/src/threads/Makefile.am
@@ -1,9 +1,7 @@
 ## src/threads/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
+## Copyright (C) 1996-2005, 2006, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,36 +19,58 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## $Id: Makefile.am 7356 2007-02-14 11:00:28Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)/src
 
 LIB =
 
 DIST_SUBDIRS = \
-	native \
-	none
+	none \
+	posix
 
 if ENABLE_THREADS
-SUBDIRS = native
+SUBDIRS = \
+	posix
 
 THREAD_LIB = \
-	native/libthreadsposix.la
+	posix/libthreadsposix.la
 else
-SUBDIRS = none
+SUBDIRS = \
+	none
+
+THREAD_LIB = \
+	none/libthreadsnone.la
 endif
 
+
 noinst_LTLIBRARIES = \
 	libthreads.la
 
+if ENABLE_THREADS
 libthreads_la_SOURCES = \
-	critical.c \
-	critical.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)