summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-12 23:20:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-12 23:20:41 +0000
commit16e0ba0f8d4d61d3af3f087df6b5202d247258fe (patch)
tree8e0c0f79e1664e78a2986917bdc84dfd44edab77
parent2007-12-12 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-16e0ba0f8d4d61d3af3f087df6b5202d247258fe.tar.bz2
2007-12-12 Joel Sherrill <joel.sherrill@OARcorp.com>
* libgnat/Makefile.am, wrapup/Makefile.am: Another attempt at the automake variables.
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/libgnat/Makefile.am4
-rw-r--r--cpukit/wrapup/Makefile.am3
3 files changed, 11 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 386e613413..810cedf67d 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2007-12-12 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * libgnat/Makefile.am, wrapup/Makefile.am: Another attempt at the
+ automake variables.
+
+2007-12-12 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* rtems/Makefile.am, rtems/include/rtems/rtems/tasks.h,
rtems/src/tasks.c, rtems/src/taskvariableadd.c,
rtems/src/taskvariabledelete.c: Add test code for task variables to
diff --git a/cpukit/libgnat/Makefile.am b/cpukit/libgnat/Makefile.am
index fbf9720ef6..a30610e848 100644
--- a/cpukit/libgnat/Makefile.am
+++ b/cpukit/libgnat/Makefile.am
@@ -6,7 +6,9 @@ include $(top_srcdir)/automake/compile.am
EXTRA_DIST=
-if LIBPOSIX
+if HAS_PTHREADS
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+
noinst_LIBRARIES = libgnat.a
libgnat_a_SOURCES = ada_intrsupp.c adasupp.c
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 06a84bcf75..ef6bb703cb 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -19,6 +19,9 @@ TMP_LIBS += ../rtems/librtems.a
if LIBPOSIX
TMP_LIBS += ../posix/libposix.a
+endif
+
+if HAS_PTHREADS
TMP_LIBS += ../libgnat/libgnat.a
endif