X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=boehm-gc%2FMakefile.am;h=c31d67aad50a74733dff93a314d350d873bd374f;hp=e9e1c6107c68e8682bce559cf375723f5c151621;hb=58606959931c9f33aa13bdbb5908d63c9cedf742;hpb=0b3959efee1dd5e996bbdb2772294af81f7926ac diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index e9e1c6107c6..c31d67aad50 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -4,51 +4,40 @@ ## files that should be in the distribution are not mentioned in this ## Makefile.am. -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = cygnus subdir-objects +ACLOCAL_AMFLAGS = -I .. -I ../config SUBDIRS = include -# Multilib support variables. -MULTISRCTOP = -MULTIBUILDTOP = -MULTIDIRS = -MULTISUBDIR = -MULTIDO = true -MULTICLEAN = true - -## Install a library built with a cross compiler in tooldir, not -## libdir. -if USE_LIBDIR -toolexeclibdir = $(libdir)$(MULTISUBDIR) +noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la + +if POWERPC_DARWIN +asm_libgcjgc_sources = powerpc_darwin_mach_dep.s else -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +asm_libgcjgc_sources = endif -noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la - -GC_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 irix_threads.c \ -linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \ +libgcjgc_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 \ +malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \ obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \ solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \ -backgraph.c win32_threads.c +backgraph.c win32_threads.c \ +pthread_support.c pthread_stop_world.c darwin_stop_world.c \ +$(asm_libgcjgc_sources) -EXTRA_GC_SOURCES = alpha_mach_dep.s \ -mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \ +libgcjgc_convenience_la_SOURCES = $(libgcjgc_la_SOURCES) + +EXTRA_DIST = alpha_mach_dep.S \ +mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s -libgcjgc_la_SOURCES = $(GC_SOURCES) -libgcjgc_convenience_la_SOURCES = $(GC_SOURCES) -EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES) -EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES) - # Include THREADLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) +libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) libgcjgc_la_DEPENDENCIES = @addobjs@ -libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir) +libgcjgc_la_LDFLAGS = -version-info 1:2:0 -rpath $(toolexeclibdir) libgcjgc_convenience_la_LIBADD = @addobjs@ libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ @@ -57,38 +46,26 @@ AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ check_PROGRAMS = gctest -# The following hack produces a warning from automake, but we need it in order -# to build a file from a subdirectory. FIXME. -test.o: tests/test.c - $(COMPILE) -c $(srcdir)/tests/test.c -# Using $< in the above seems to fail with the HP/UX on Itanium make. - -gctest_OBJECTS = test.o -gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS) +gctest_SOURCES = tests/test.c +gctest_LDADD = ./libgcjgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) gctest_LDFLAGS = -shared-libgcc TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc TESTS = gctest -## FIXME: relies on internal code generated by automake. -all_objs = @addobjs@ $(libgcjgc_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 include/gc_mark.h - ## FIXME: we shouldn't have to do this, but automake forces us to. .s.lo: ## We use -Wp,-P to strip #line directives. Irix `as' chokes on ## these. $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $< +.S.lo: + $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $< ## We have our own definition of LTCOMPILE because we want to use our ## CFLAGS, not those passed in from the top level make. -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@ -AM_CFLAGS = @GC_CFLAGS@ - # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. @@ -132,28 +109,10 @@ AM_MAKEFLAGS = \ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host -# Multilib support. -.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ - maintainer-clean-multi - -all-am: all-multi -install-am: install-multi -mostlyclean-am: mostlyclean-multi -clean-am: clean-multi -distclean-am: distclean-multi -maintainer-clean-am: maintainer-clean-multi - -all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do -install-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -mostlyclean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean -clean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean -distclean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean -maintainer-clean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean - MAKEOVERRIDES= + +# No install-html or install-pdf support in automake yet +.PHONY: install-html install-pdf +install-html: +install-pdf: +