summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorhboehm <hboehm>2008-01-11 00:04:28 +0000
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 21:06:42 +0400
commit9fd2b58a4445c35056c2f0cec196f40ee9134787 (patch)
tree6f34da5a43d5e67f15739a29e66e6fb32df26d22 /Makefile.am
parent7ecbf85d67ff8f839e966ed8bbae33e079ea34b6 (diff)
downloadbdwgc-9fd2b58a4445c35056c2f0cec196f40ee9134787.tar.gz
2008-01-10 Hans Boehm <Hans.Boehm@hp.com>
* Makefile.am: Mention atomic_ops.c and atomic_ops_sysdeps.S again. Refer to build directory as ".". * Makefile.in: Regenerate.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index ba1ec6d3..5565a532 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,14 @@ if WIN32_THREADS
libgc_la_SOURCES += win32_threads.c
endif
+if USE_INTERNAL_LIBATOMIC_OPS
+nodist_libgc_la_SOURCES = ./atomic_ops.c
+endif
+
+if NEED_ATOMIC_OPS_ASM
+nodist_libgc_la_SOURCES = ./atomic_ops_sysdeps.S
+endif
+
# Include THREADDLLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
@@ -90,7 +98,7 @@ if CPLUSPLUS
lib_LTLIBRARIES += libgccpp.la
pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(top_builddir)/libgc.la
+libgccpp_la_LIBADD = ./libgc.la
libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
endif