projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/mm/boehm-gc/Makefile.am, src/mm/boehm-gc/libatomic_ops/Makefile.am:
[cacao.git]
/
src
/
mm
/
boehm-gc
/
Makefile.am
diff --git
a/src/mm/boehm-gc/Makefile.am
b/src/mm/boehm-gc/Makefile.am
index 94fa27f8948fa9757bd659b2cbb6c6c6f6463c57..4679b05ccad47bf41807dd1f031f14adabf3b864 100644
(file)
--- a/
src/mm/boehm-gc/Makefile.am
+++ b/
src/mm/boehm-gc/Makefile.am
@@
-1,8
+1,8
@@
# Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved.
# Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved.
-#
+#
# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
# OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
# OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
-#
+#
# Permission is hereby granted to use or copy this program
# for any purpose, provided the above notices are retained on all copies.
# Permission to modify the code and to distribute modified code is granted,
# Permission is hereby granted to use or copy this program
# for any purpose, provided the above notices are retained on all copies.
# Permission to modify the code and to distribute modified code is granted,
@@
-23,7
+23,7
@@
# use the internal version. This is done since libatomic_ops doesn't
# use libtool, since it has no real use for it. But that seems to make
# it hard to use either the resulting object files or libraries.
# use the internal version. This is done since libatomic_ops doesn't
# use libtool, since it has no real use for it. But that seems to make
# it hard to use either the resulting object files or libraries.
-# Thus there seems too be no real reason to recusively build in the
+# Thus there seems too be no real reason to recu
r
sively build in the
# libatomic_ops directory.
# if USE_INTERNAL_LIBATOMICS_OPS
# SUBDIRS = @maybe_libatomic_ops@
# libatomic_ops directory.
# if USE_INTERNAL_LIBATOMICS_OPS
# SUBDIRS = @maybe_libatomic_ops@
@@
-31,10
+31,19
@@
# SUBDIRS =
# endif
SUBDIRS =
# SUBDIRS =
# endif
SUBDIRS =
+DIST_SUBDIRS = libatomic_ops
+
+ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+if USE_INTERNAL_LIBATOMIC_OPS
+AM_CPPFLAGS += -I$(top_builddir)/libatomic_ops/src \
+ -I$(top_srcdir)/libatomic_ops/src
+endif
# Initialize variables so that we can declare files locally.
# Initialize variables so that we can declare files locally.
-EXTRA_DIST =
+EXTRA_DIST =
lib_LTLIBRARIES =
lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
include_HEADERS =
pkginclude_HEADERS =
dist_noinst_HEADERS =
include_HEADERS =
pkginclude_HEADERS =
dist_noinst_HEADERS =
@@
-42,12
+51,12
@@
check_PROGRAMS =
TESTS =
pkgconfigdir = $(libdir)/pkgconfig
TESTS =
pkgconfigdir = $(libdir)/pkgconfig
-
dist_
pkgconfig_DATA = bdw-gc.pc
+pkgconfig_DATA = bdw-gc.pc
# C Library
# ---------
# C Library
# ---------
-
lib
_LTLIBRARIES += libgc.la
+
noinst
_LTLIBRARIES += libgc.la
libgc_la_SOURCES = \
allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
libgc_la_SOURCES = \
allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
@@
-72,16
+81,16
@@
libgc_la_SOURCES += win32_threads.c
endif
if USE_INTERNAL_LIBATOMIC_OPS
endif
if USE_INTERNAL_LIBATOMIC_OPS
-nodist_libgc_la_SOURCES = atomic_ops.c
+nodist_libgc_la_SOURCES =
libatomic_ops/src/
atomic_ops.c
endif
if NEED_ATOMIC_OPS_ASM
endif
if NEED_ATOMIC_OPS_ASM
-nodist_libgc_la_SOURCES = atomic_ops_sysdeps.S
+nodist_libgc_la_SOURCES =
libatomic_ops/src/
atomic_ops_sysdeps.S
endif
# Include THREADDLLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
endif
# Include THREADDLLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
$(ATOMIC_OPS_LIBS)
libgc_la_DEPENDENCIES = @addobjs@
libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
libgc_la_DEPENDENCIES = @addobjs@
libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
@@
-98,7
+107,7
@@
if CPLUSPLUS
lib_LTLIBRARIES += libgccpp.la
pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
libgccpp_la_SOURCES = gc_cpp.cc
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
libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
endif
@@
-111,12
+120,11
@@
EXTRA_DIST += gc_cpp.cpp
# Misc
# ----
# Misc
# ----
-#AM_CXXFLAGS = @GC_CFLAGS@
-#AM_CFLAGS = @GC_CFLAGS@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libatomic_ops-1.2/src
+AM_CXXFLAGS = @GC_CFLAGS@
+AM_CFLAGS = @GC_CFLAGS@
## FIXME: relies on internal code generated by automake.
## FIXME: relies on internal code generated by automake.
-## FIXME: ./configure --enable-dependency-tracking should be used
+## FIXME: ./configure --enable-dependency-tracking should be used
#all_objs = @addobjs@ $(libgc_la_OBJECTS)
#$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
#include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
#all_objs = @addobjs@ $(libgc_la_OBJECTS)
#$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
#include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
@@
-155,7
+163,6
@@
dist_noinst_SCRIPTS = callprocs configure.host
# headers which are not installed
# (see include/include.am for more)
#
# headers which are not installed
# (see include/include.am for more)
#
-dist_noinst_HEADERS += version.h
# documentation which is not installed
#
# documentation which is not installed
#
@@
-163,36
+170,33
@@
EXTRA_DIST += README.QUICK
# other makefiles
# :GOTCHA: deliberately we do not include 'Makefile'
# other makefiles
# :GOTCHA: deliberately we do not include 'Makefile'
-EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE
NT_THREADS_MAKEFILE
\
+EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE \
Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE \
Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
- WCC_MAKEFILE configure_atomic_ops.sh \
- NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE
+ WCC_MAKEFILE build_atomic_ops.sh build_atomic_ops.sh.cygwin \
+ NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE \
+ NT_X64_THREADS_MAKEFILE
# files used by makefiles other than Makefile.am
#
# files used by makefiles other than Makefile.am
#
-EXTRA_DIST +=
add_gc_prefix.c gcname.c if_mach.c if_not_ther
e.c \
-
hpux_test_and_clear.s gc.mak MacOS.c
\
-
MacProjects.sit.hqx mach_dep.c
setjmp_t.c \
-
threadlibs.c
AmigaOS.c \
+EXTRA_DIST +=
extra/add_gc_prefix.c extra/gc.c extra/gcnam
e.c \
+
extra/if_mach.c extra/if_not_there.c hpux_test_and_clear.s gc.mak
\
+
extra/MacOS.c MacProjects.sit.hqx mach_dep.c extra/
setjmp_t.c \
+
extra/threadlibs.c extra/
AmigaOS.c \
Mac_files/datastart.c Mac_files/dataend.c \
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
Mac_files/datastart.c Mac_files/dataend.c \
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
- include/private/msvc_dbg.h msvc_dbg.c
+ include/private/msvc_dbg.h
extra/
msvc_dbg.c
# The libatomic_ops library. This is not ideal, since we pick up junk from
# The libatomic_ops library. This is not ideal, since we pick up junk from
-# there.
The hard-coded version number should also go.
-EXTRA_DIST += libatomic_ops
-1.2
+# there.
+EXTRA_DIST += libatomic_ops
# this is an auxiliary shell file used by Makefile and Makefile.direct
#
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
# this is an auxiliary shell file used by Makefile and Makefile.direct
#
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
-# :FIXME: why do we distribute this one???
#
#
-EXTRA_DIST += libtool.m4
-
-#
-# :GOTCHA: GNU make rule for making .s out of .S is flawed,
+# :GOTCHA: GNU make rule for making .s out of .S is flawed,
# it will not remove dest if building fails
.S.s:
if $(CPP) $< >$@ ; then :; else rm -f $@; fi
# it will not remove dest if building fails
.S.s:
if $(CPP) $< >$@ ; then :; else rm -f $@; fi
@@
-203,5
+207,3
@@
include tests/tests.am
include doc/doc.am
# Putting these at the top causes cord to be built first, and not find libgc.a
# on HP/UX. There may be a better fix.
include doc/doc.am
# Putting these at the top causes cord to be built first, and not find libgc.a
# on HP/UX. There may be a better fix.
-
-