From 2782e69ff08bbb4d16a11e2fc6fb470f1592a0af Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 26 Oct 1999 12:39:24 +0000
Subject: idir=/opt/tmp/opt/rtems rdir=/opt/rtems

cd $idir
find . -type f | while read file
do
  if [ ! -f ${file} ] ; then
     echo ${file} missing
  fi
done
---
 c/src/configure.in                 | 5 +++++
 c/src/exec/libcsupport/Makefile.am | 6 +-----
 c/src/lib/Makefile.am              | 6 +-----
 c/src/lib/configure.in             | 6 ------
 c/src/libchip/Makefile.am          | 4 ++--
 c/src/libchip/configure.in         | 6 +++---
 6 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'c/src')

diff --git a/c/src/configure.in b/c/src/configure.in
index cde422db48..f4b2ca89ef 100644
--- a/c/src/configure.in
+++ b/c/src/configure.in
@@ -29,6 +29,11 @@ cfg_subdirs="$cfg_subdirs exec"
 cfg_subdirs="$cfg_subdirs lib"
 cfg_subdirs="$cfg_subdirs libmisc"
 
+if test "$RTEMS_CPU" != "unix"; then
+## HACK: Suppress libchip for unix
+cfg_subdirs="$cfg_subdirs libchip"
+fi
+
 if test "$HAS_NETWORKING" = "yes"; then
   cfg_subdirs="$cfg_subdirs libnetworking librpc"
   if test "$RTEMS_HAS_RDBG" = "yes"; then
diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am
index db61ed978e..a77bfe9538 100644
--- a/c/src/exec/libcsupport/Makefile.am
+++ b/c/src/exec/libcsupport/Makefile.am
@@ -5,12 +5,8 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-if HAS_LIBCHIP
-LIBCHIP = libchip
-endif
-
 SUBDIRS = start include libc libcpu libbsp \
-    $(LIBCHIP) $(LIBHWAPI)
+    $(LIBHWAPI)
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am
index db61ed978e..a77bfe9538 100644
--- a/c/src/lib/Makefile.am
+++ b/c/src/lib/Makefile.am
@@ -5,12 +5,8 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-if HAS_LIBCHIP
-LIBCHIP = libchip
-endif
-
 SUBDIRS = start include libc libcpu libbsp \
-    $(LIBCHIP) $(LIBHWAPI)
+    $(LIBHWAPI)
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in
index 3a5a0ac5ff..4229ac158d 100644
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -58,13 +58,7 @@ RTEMS_CPU_STARTdir="$RTEMS_CPU"
 fi
 AC_SUBST(RTEMS_CPU_STARTdir)
 
-if test "$RTEMS_CPU" != "unix"; then
-## HACK: Suppress libchip for unix
-cfg_subdirs="$cfg_subdirs libchip"
-fi
-
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(HAS_LIBCHIP,test "$RTEMS_CPU" != "unix")
 
 AC_CONFIG_SUBDIRS($cfg_subdirs)
 
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 8acdb643b0..c8a57bd9c2 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -7,5 +7,5 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 SUBDIRS = rtc serial network
 
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../../../automake/subdirs.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libchip/configure.in b/c/src/libchip/configure.in
index fc5a8b0895..e7d2d5a9be 100644
--- a/c/src/libchip/configure.in
+++ b/c/src/libchip/configure.in
@@ -4,11 +4,11 @@ dnl $Id$
 
 AC_PREREQ(2.13)
 AC_INIT(rtc)
-RTEMS_TOP(../../../..)
-AC_CONFIG_AUX_DIR(../../../..)
+RTEMS_TOP(../../..)
+AC_CONFIG_AUX_DIR(../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libchip,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-libchip,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_NETWORKING
-- 
cgit v1.2.3