5 files changed, 75 insertions, 14 deletions
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
new file mode 100644
index 0000000000..72f874defd
--- /dev/null
+++ b/c/src/libchip/Makefile.am
@@ -0,0 +1,11 @@
+#
+#  $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SUBDIRS = rtc serial network
+
+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
new file mode 100644
index 0000000000..099d2ea84f
--- /dev/null
+++ b/c/src/libchip/configure.in
@@ -0,0 +1,48 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(rtc)
+RTEMS_TOP(../../../..)
+AC_CONFIG_AUX_DIR(../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libchip,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+RTEMS_ENABLE_BARE
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
+
+# pick up all the Makefiles in required parts of the tree
+if test "$RTEMS_CPU" = "unix"; then
+## HACK: Suppress libchip for unix
+AC_MSG_ERROR(Can't build libchip for $RTEMS_CPU)
+fi
+
+AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes")
+
+# try to explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+network/Makefile
+rtc/Makefile
+serial/Makefile
+)
diff --git a/c/src/libchip/network/Makefile.in b/c/src/libchip/network/Makefile.in
index beccb11c8b..d6ae6e9bcc 100644
--- a/c/src/libchip/network/Makefile.in
+++ b/c/src/libchip/network/Makefile.in
@@ -1,12 +1,12 @@
 #
-#  $Id$
+# $Id$
 #
 
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libchip/network
+top_builddir = ..
+subdir = network
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -55,17 +55,19 @@ CFLAGS += $(LIBC_DEFINES)
 CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
-all: ${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
+all: @HAS_NETWORKING_TRUE@${ARCH} preinstall $(LIB)
+@HAS_NETWORKING_TRUE@	$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
 
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
+$(LIB): @HAS_NETWORKING_TRUE@$(SRCS) ${OBJS}
+@HAS_NETWORKING_TRUE@	$(make-library)
 
 # Install the library, appending _g or _p as appropriate.
 # for include files, just use $(INSTALL_CHANGE)
 preinstall: 
-	$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
-	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
+@HAS_NETWORKING_TRUE@	$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
+@HAS_NETWORKING_TRUE@	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
+
+EXTRA_DIST = README README.sonic
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/libchip/rtc/Makefile.in b/c/src/libchip/rtc/Makefile.in
index ce03711447..8039ef32d6 100644
--- a/c/src/libchip/rtc/Makefile.in
+++ b/c/src/libchip/rtc/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libchip/rtc
+top_builddir = ..
+subdir = rtc
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -66,7 +66,7 @@ $(LIB): $(SRCS) ${OBJS}
 # Install the library, appending _g or _p as appropriate.
 # for include files, just use $(INSTALL_CHANGE)
 preinstall: 
-	$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
 	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/libchip/serial/Makefile.in b/c/src/libchip/serial/Makefile.in
index ad0d866fb9..ee1d4cede6 100644
--- a/c/src/libchip/serial/Makefile.in
+++ b/c/src/libchip/serial/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libchip/serial
+top_builddir = ..
+subdir = serial
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@