Commit de5e27be by Tom Tromey

Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (TESTS_ENVIRONMENT): New macro.

From-SVN: r40568
parent cf440c3c
2001-03-16 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (TESTS_ENVIRONMENT): New macro.
2001-01-23 Rod Stewart <stewart@lab43.org>
* gcconfig.h: Check for `__arm__', not `arm'.
2000-12-30 Bryce McKinlay <bryce@albatross.co.nz> 2000-12-30 Bryce McKinlay <bryce@albatross.co.nz>
* configure.in: Rename THREADLIB to THREADLIBS. * configure.in: Rename THREADLIB to THREADLIBS.
......
...@@ -50,6 +50,7 @@ check_PROGRAMS = gctest ...@@ -50,6 +50,7 @@ check_PROGRAMS = gctest
gctest_SOURCES = test.c gctest_SOURCES = test.c
gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS) gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
TESTS = gctest TESTS = gctest
## FIXME: relies on internal code generated by automake. ## FIXME: relies on internal code generated by automake.
......
...@@ -102,9 +102,12 @@ MULTIDIRS = ...@@ -102,9 +102,12 @@ MULTIDIRS =
MULTISUBDIR = MULTISUBDIR =
MULTIDO = true MULTIDO = true
MULTICLEAN = true MULTICLEAN = true
@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) @USE_LIBDIR_TRUE@toolexeclibdir = \
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) @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) toolexeclib_LTLIBRARIES = $(target_all)
EXTRA_LTLIBRARIES = libgcjgc.la EXTRA_LTLIBRARIES = libgcjgc.la
...@@ -136,6 +139,7 @@ check_PROGRAMS = gctest ...@@ -136,6 +139,7 @@ check_PROGRAMS = gctest
gctest_SOURCES = test.c gctest_SOURCES = test.c
gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS) gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
TESTS = gctest TESTS = gctest
all_objs = @addobjs@ $(libgcjgc_la_OBJECTS) all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
...@@ -406,7 +410,7 @@ distdir: $(DISTFILES) ...@@ -406,7 +410,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \ cp -pr $$/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment