summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-26 12:39:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-26 12:39:24 +0000
commit2782e69ff08bbb4d16a11e2fc6fb470f1592a0af (patch)
treeecbb74042797dafa41ce84b602fbe796ca36c9d1
parenta94521ccc758d0ded4336016b5f7bb1b92bce858 (diff)
downloadrtems-2782e69ff08bbb4d16a11e2fc6fb470f1592a0af.tar.bz2
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
Diffstat (limited to '')
-rw-r--r--c/src/configure.in5
-rw-r--r--c/src/exec/libcsupport/Makefile.am6
-rw-r--r--c/src/lib/Makefile.am6
-rw-r--r--c/src/lib/configure.in6
-rw-r--r--c/src/libchip/Makefile.am4
-rw-r--r--c/src/libchip/configure.in6
-rw-r--r--cpukit/libcsupport/Makefile.am6
7 files changed, 13 insertions, 26 deletions
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
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index db61ed978e..a77bfe9538 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/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