Merged revisions 7797-7917 via svnmerge from

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

diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am
index 7348124ebe1bb526e3160fee8d9396c1454fed63..f8e34c8d0671ff001c8380ebe1b561dfe9dabbf4 100644 (file)
--- a/src/threads/Makefile.am
+++ b/src/threads/Makefile.am
@@ -1,4 +1,6 @@
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+## 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
@@ -20,25 +22,36 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 ##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 7813 2007-04-25 19:20:13Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-if USE_THREADS
-if NATIVE_THREADS
-SUBDIRS = native
-else
-SUBDIRS = green
-endif
-else
-SUBDIRS =
-endif
+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
+
+SUBDIRS = \
+       native
+
+THREAD_LIB = \
+       native/libthreadsposix.la
+
+noinst_LTLIBRARIES = \
+       libthreads.la
+
+libthreads_la_SOURCES = \
+       critical.c \
+       critical.h \
+       lock-common.h \
+       threads-common.c \
+       threads-common.h
+
+libthreads_la_LIBADD = \
+       $(THREAD_LIB)
 
 
 ## Local variables: