summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/exec/libcsupport/Makefile.am2
-rw-r--r--c/src/lib/ChangeLog6
-rw-r--r--c/src/lib/Makefile.am2
-rw-r--r--c/src/lib/configure.in2
-rw-r--r--cpukit/libcsupport/Makefile.am2
5 files changed, 9 insertions, 5 deletions
diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am
index e4ff9c707a..2715ac902b 100644
--- a/c/src/exec/libcsupport/Makefile.am
+++ b/c/src/exec/libcsupport/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
SUBDIRS = include libc
diff --git a/c/src/lib/ChangeLog b/c/src/lib/ChangeLog
index d0e09e1a0e..117109c1a8 100644
--- a/c/src/lib/ChangeLog
+++ b/c/src/lib/ChangeLog
@@ -1,3 +1,9 @@
+
+2000-10-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in: Remove bogus cfg_subdirs.
+ * Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
2000-10-24 Joel Sherrill <joel@OARcorp.com>
diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am
index e4ff9c707a..2715ac902b 100644
--- a/c/src/lib/Makefile.am
+++ b/c/src/lib/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
SUBDIRS = include libc
diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in
index fa748c5dcf..01eaacccab 100644
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -32,8 +32,6 @@ AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix")
AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes")
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AC_CONFIG_SUBDIRS($cfg_subdirs)
-
# Explicitly list all Makefiles here
AC_OUTPUT(
Makefile
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index e4ff9c707a..2715ac902b 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
SUBDIRS = include libc