diff options
| author | tschwinge <tschwinge> | 2008-05-29 22:22:59 +0000 |
|---|---|---|
| committer | tschwinge <tschwinge> | 2008-05-29 22:22:59 +0000 |
| commit | 31cc070ebdc9e8dcadeb1d3ef15e1cfb5770868a (patch) | |
| tree | 16fd20f917cf46701ba1fc0fcd46618d3c0ab38c | |
| parent | 5f99bb6eecbbf705d1dd67737f958023141dfc80 (diff) | |
2008-05-29 Thomas Schwinge <tschwinge@gnu.org>
* Makefile.am: Rework system of build flags for the test programs.
| -rw-r--r-- | viengoos/ChangeLog | 4 | ||||
| -rw-r--r-- | viengoos/Makefile.am | 27 |
2 files changed, 21 insertions, 10 deletions
diff --git a/viengoos/ChangeLog b/viengoos/ChangeLog index 155172e..808384b 100644 --- a/viengoos/ChangeLog +++ b/viengoos/ChangeLog @@ -1,3 +1,7 @@ +2008-05-29 Thomas Schwinge <tschwinge@gnu.org> + + * Makefile.am: Rework system of build flags for the test programs. + 2008-05-29 Neal H. Walfield <neal@gnu.org> * as.c: Include <hurd/exceptions.h>. diff --git a/viengoos/Makefile.am b/viengoos/Makefile.am index 4851f91..5ea3677 100644 --- a/viengoos/Makefile.am +++ b/viengoos/Makefile.am @@ -62,8 +62,15 @@ viengoos_LDFLAGS = -u_start -e_start -N -nostdlib \ TESTS = t-as t-activity t-link t-guard check_PROGRAMS = $(TESTS) -t_as_CPPFLAGS = $(viengoos_CPPFLAGS) -include $(srcdir)/t-environment.h -t_as_CFLAGS = $(viengoos_CFLAGS) +CHECK_CPPFLAGS += \ + -DRM_INTERN \ + -include $(srcdir)/t-environment.h +CHECK_LDADD = \ + ../libhurd-btree/libhurd-btree.a \ + ../libhurd-ihash/libhurd-ihash-nomalloc.a + +t_as_CPPFLAGS = $(CHECK_CPPFLAGS) +t_as_CFLAGS = $(CHECK_CFLAGS) t_as_SOURCES = t-as.c \ zalloc.h zalloc.c \ memory.h memory.c \ @@ -76,10 +83,10 @@ t_as_SOURCES = t-as.c \ shutdown.h shutdown.c \ panic.c \ debug.h debug.c -t_as_LDADD = $(viengoos_LDADD) +t_as_LDADD = $(CHECK_LDADD) -t_activity_CPPFLAGS = $(viengoos_CPPFLAGS) -include $(srcdir)/t-environment.h -t_activity_CFLAGS = $(viengoos_CFLAGS) +t_activity_CPPFLAGS = $(CHECK_CPPFLAGS) +t_activity_CFLAGS = $(CHECK_CFLAGS) t_activity_SOURCES = t-activity.c \ zalloc.h zalloc.c \ memory.h memory.c \ @@ -92,15 +99,15 @@ t_activity_SOURCES = t-activity.c \ shutdown.h shutdown.c \ panic.c \ debug.h debug.c -t_activity_LDADD = $(viengoos_LDADD) +t_activity_LDADD = $(CHECK_LDADD) -t_link_CPPFLAGS = $(viengoos_CPPFLAGS) -include $(srcdir)/t-environment.h -t_link_CFLAGS = $(viengoos_CFLAGS) +t_link_CPPFLAGS = $(CHECK_CPPFLAGS) +t_link_CFLAGS = $(CHECK_CFLAGS) t_link_SOURCES = t-link.c list.h \ output.h output.c output-stdio.c panic.c shutdown.h shutdown.c -t_guard_CPPFLAGS = $(viengoos_CPPFLAGS) -include $(srcdir)/t-environment.h -t_guard_CFLAGS = $(viengoos_CFLAGS) -include $(srcdir)/t-environment.h +t_guard_CPPFLAGS = $(CHECK_CPPFLAGS) +t_guard_CFLAGS = $(CHECK_CFLAGS) t_guard_SOURCES = t-guard.c \ output.h output.c output-stdio.c panic.c shutdown.h shutdown.c |