summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-07-10 08:07:50 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-07-10 08:07:50 +0000
commitec463acb01f4b2d379af1c88bfe3da793431d9ff (patch)
tree179a2037428d19d2cc5c1fbeb37fd5a2dac1a640 /c
parent2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-ec463acb01f4b2d379af1c88bfe3da793431d9ff.tar.bz2
2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged into ../configure.ac). * Makefile.am, ide/Makefile.am, network/Makefile.am, rtc/Makefile.am, serial/Makefile.am: Reflect having merged configure.ac into ../configure.ac
Diffstat (limited to 'c')
-rw-r--r--c/src/libchip/ChangeLog7
-rw-r--r--c/src/libchip/Makefile.am6
-rw-r--r--c/src/libchip/configure.ac50
-rw-r--r--c/src/libchip/ide/Makefile.am8
-rw-r--r--c/src/libchip/network/Makefile.am6
-rw-r--r--c/src/libchip/rtc/Makefile.am6
-rw-r--r--c/src/libchip/serial/Makefile.am6
7 files changed, 22 insertions, 67 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog
index 1f46604d7b..0b2d980849 100644
--- a/c/src/libchip/ChangeLog
+++ b/c/src/libchip/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove (Merged into ../configure.ac).
+ * Makefile.am, ide/Makefile.am, network/Makefile.am,
+ rtc/Makefile.am, serial/Makefile.am:
+ Reflect having merged configure.ac into ../configure.ac
+
2003-06-30 Greg Menke <gregory.menke@gsfc.nasa.gov>
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 150e222ee3..918853462a 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -2,9 +2,7 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
SUBDIRS = rtc serial network ide
-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.ac b/c/src/libchip/configure.ac
deleted file mode 100644
index 29946085aa..0000000000
--- a/c/src/libchip/configure.ac
+++ /dev/null
@@ -1,50 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-##
-## $Id$
-
-AC_PREREQ(2.57)
-AC_INIT([rtems-c-src-libchip],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
-AC_CONFIG_SRCDIR([rtc])
-RTEMS_TOP(../../..)
-
-RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
-AM_MAINTAINER_MODE
-
-RTEMS_ENABLE_NETWORKING
-RTEMS_ENABLE_BARE
-
-RTEMS_ENV_RTEMSBSP
-
-RTEMS_CHECK_CPU
-RTEMS_CANONICAL_HOST
-
-RTEMS_PROJECT_ROOT
-
-RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
-RTEMS_CANONICALIZE_TOOLS
-
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-RTEMS_CHECK_NETWORKING(RTEMS_BSP)
-
-# 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
-
-AS_IF([test "$host_cpu" = "sparc"],[
- AC_DEFINE_UNQUOTED([CPU_U32_FIX],[1],
- [whether to enable ipalignment work-around])
-])
-
-AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes")
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-network/Makefile
-rtc/Makefile
-serial/Makefile
-ide/Makefile
-])
-AC_OUTPUT
diff --git a/c/src/libchip/ide/Makefile.am b/c/src/libchip/ide/Makefile.am
index 89a79aaf53..566a98cb1b 100644
--- a/c/src/libchip/ide/Makefile.am
+++ b/c/src/libchip/ide/Makefile.am
@@ -18,8 +18,8 @@ include_ide_HEADERS = ata.h ide_ctrl_cfg.h ide_ctrl.h ide_ctrl_io.h
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
$(include_ide_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
@@ -36,5 +36,5 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
EXTRA_DIST = $(C_FILES)
-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/network/Makefile.am b/c/src/libchip/network/Makefile.am
index 926e4bba28..e6a170a1e3 100644
--- a/c/src/libchip/network/Makefile.am
+++ b/c/src/libchip/network/Makefile.am
@@ -13,8 +13,8 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_libchip_HEADERS = cs8900.h i82586var.h if_fxpvar.h sonic.h if_media.h mii.h
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
$(PROJECT_INCLUDE)/libchip:
@$(mkinstalldirs) $@
@@ -49,4 +49,4 @@ endif
EXTRA_DIST = README README.cs8900 README.dec21140 README.i82586 README.sonic \
cs8900.c cs8900.c.bsp dec21140.c i82586.c if_fxp.c sonic.c
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am
index 368bf4c7d3..09ba595c28 100644
--- a/c/src/libchip/rtc/Makefile.am
+++ b/c/src/libchip/rtc/Makefile.am
@@ -16,8 +16,8 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_libchip_HEADERS = rtc.h icm7170.h m48t08.h
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
$(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
@@ -40,4 +40,4 @@ DOC_FILES = README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS
EXTRA_DIST = $(C_FILES) $(DOC_FILES)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am
index eeb3c4de71..1d8ef3f130 100644
--- a/c/src/libchip/serial/Makefile.am
+++ b/c/src/libchip/serial/Makefile.am
@@ -16,8 +16,8 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
noinst_HEADERS = mc68681_p.h ns16550_p.h z85c30_p.h
include_libchip_HEADERS = mc68681.h ns16550.h z85c30.h serial.h sersupp.h
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
$(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
@@ -41,4 +41,4 @@ DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \
EXTRA_DIST = $(C_FILES) $(DOC_FILES)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am