X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/1b96e9580714d7a677d10a8e286b3f8a2bddc6f5..898aa30bfb038ffeca54d6dea95f0f80fbc08f7f:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index f3625c8..452e811 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,22 +124,19 @@ check_PROGRAMS += t/scantest
 t_scantest_LDADD = src/scan.lo src/parse.lo src/keywords.lo $(TEST_LIBS)
 $(t_scantest_OBJECTS): $(gnulib_headers) src/scan.h src/parse.h
 
-EXTRA_LIBRARIES += t/libmemwrap.a
-t_libmemwrap_a_SOURCES = t/memwrap.c
-$(t_libmemwrap_a_OBJECTS): $(gnulib_headers)
-
-EXTRA_LIBRARIES += t/liberrtest.a
-t_liberrtest_a_SOURCES = src/error.c
-t_liberrtest_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_MALLOC_HOOK
-t_liberrtest_a_SHORTNAME = t
-$(t_liberrtest_a_OBJECTS): $(gnulib_headers)
+EXTRA_LTLIBRARIES += t/liberrtest.la
+t_liberrtest_la_SOURCES = src/error.c t/errmemwrap.c
+t_liberrtest_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_MALLOC_HOOK
+t_liberrtest_la_LDFLAGS  = -no-undefined -avoid-version \
+                            -bindir '$(bindir)' -rpath '$(libdir)'
+EXTRA_t_liberrtest_la_DEPENDENCIES = $(shared_gl_objects)
+t_liberrtest_la_LIBADD = src/output.lo $(EXTRA_t_liberrtest_la_DEPENDENCIES) \
+                         $(LTLIBINTL) $(LIBTHREAD)
+t_liberrtest_la_SHORTNAME = t
+$(t_liberrtest_la_OBJECTS): $(gnulib_headers)
 
 check_PROGRAMS += t/errthread
-EXTRA_t_errthread_DEPENDENCIES = $(t_liberrtest_a_OBJECTS) \
-                                 $(t_libmemwrap_a_OBJECTS) \
-                                 src/output.lo $(shared_gl_objects)
-t_errthread_LDADD = $(EXTRA_t_errthread_DEPENDENCIES) \
-                    libtest.a $(LTLIBINTL) $(LIBMULTITHREAD)
+t_errthread_LDADD = t/liberrtest.la libtest.a $(LIBMULTITHREAD)
 $(t_errthread_OBJECTS): $(gnulib_headers) src/errmsg.h
 
 src/error.lo: src/errmsg.h
@@ -366,7 +363,8 @@ $(GPERFFILES:.gperf=.c): $(srcdir)/src/gperf-wordwrap.awk
 atlocal: config.status
 	$(AM_V_GEN) $(AWK) </dev/null >$@.tmp \
 	  'BEGIN{ for (i = 1; i < ARGC; i++) print ": \"$${" ARGV[i] "}\""; }' \
-	  'AWK=$(AWK)' 'EXEEXT=$(EXEEXT)' 'check_PROGRAMS=$(check_PROGRAMS)'
+	  'AWK=$(AWK)' 'EXEEXT=$(EXEEXT)' 'check_PROGRAMS=$(check_PROGRAMS)' \
+	  'host_os=$(host_os)'
 	$(AM_V_at) mv -f $@.tmp $@
 check_DATA = atlocal
 CLEANFILES += atlocal