diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-08 17:59:57 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-08 17:59:57 +0000 |
| commit | f4f1d408394e08eda23c361eb88200d5e7b2a56f (patch) | |
| tree | fdfe708fbcc4c747458439c0c70fe79ce734b64f /boehm-gc/Makefile.in | |
| parent | 83732bbbae0a6c61592d17081a02be5c07fa66cb (diff) | |
| download | gcc-f4f1d408394e08eda23c361eb88200d5e7b2a56f.tar.gz | |
For PR bootstrap/3075:
* configure, aclocal.m4, Makefile.in: Rebuilt.
* configure.in: Don't call AC_CONFIG_AUX_DIR or
AC_CANONICAL_SYSTEM.
* acinclude.m4 (BOEHM_CONFIGURE): Call AC_CONFIG_AUX_DIR and
AC_CANONICAL_SYSTEM here.
* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
boehm_gc_basedir.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43033 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc/Makefile.in')
| -rw-r--r-- | boehm-gc/Makefile.in | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 87111d34828..28838d6a1aa 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -102,9 +102,12 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true -@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) +@USE_LIBDIR_TRUE@toolexeclibdir = \ +@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexeclibdir = \ +@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexecdir = \ +@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) toolexeclib_LTLIBRARIES = $(target_all) EXTRA_LTLIBRARIES = libgcjgc.la @@ -132,7 +135,6 @@ AM_CXXFLAGS = @BOEHM_GC_CFLAGS@ AM_CFLAGS = @BOEHM_GC_CFLAGS@ check_PROGRAMS = gctest - gctest_OBJECTS = test.o gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS) gctest_LDFLAGS = -shared-libgcc @@ -189,7 +191,7 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" -CONFIG_STATUS_DEPENDENCIES = $(boehm_gc_basedir)/configure.host +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host MAKEOVERRIDES = ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -219,7 +221,7 @@ configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES) OBJECTS = $(libgcjgc_la_OBJECTS) @@ -394,7 +396,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -511,7 +513,8 @@ install-am install uninstall-am uninstall all-redirect all-am all \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean - +# 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 $< $(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \ |