summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-10 14:23:56 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-10 14:23:56 +0000
commit53ab4823e082a13e7e59d737813394f846b82fc2 (patch)
tree133c2fbd6e8028ce1076f85e74f63022a70a582a /c/src
parentPatch rtems-rc-20000104-7.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-53ab4823e082a13e7e59d737813394f846b82fc2.tar.bz2
Patch rtems-rc-20000104-9.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that converts the hppa1.1 directory to automake. NOTE: * Due to not having a toolchain (gcc refuses to build) this patch is untested. * I omited/deactivated the pxfl subdirectory, because I don't understand how it supposed to work. Joel's note: It was right to ignore the pxfl directory. It should be removed one the BSPs are moved outside the tree. This was an old hack.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/lib/libbsp/hppa1.1/Makefile.am12
-rw-r--r--c/src/lib/libbsp/hppa1.1/Makefile.in26
-rw-r--r--c/src/lib/libbsp/hppa1.1/configure.in26
-rw-r--r--c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am17
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in32
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/configure.in37
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am35
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in65
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in8
14 files changed, 139 insertions, 139 deletions
diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.am b/c/src/lib/libbsp/hppa1.1/Makefile.am
new file mode 100644
index 0000000000..6e02be9e8e
--- /dev/null
+++ b/c/src/lib/libbsp/hppa1.1/Makefile.am
@@ -0,0 +1,12 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# Descend into the $(RTEMS_BSP_FAMILY) directory
+SUBDIRS = $(RTEMS_BSP_FAMILY)
+
+include $(top_srcdir)/../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.in b/c/src/lib/libbsp/hppa1.1/Makefile.in
deleted file mode 100644
index 99ba6722d0..0000000000
--- a/c/src/lib/libbsp/hppa1.1/Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = hppa1.1
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# Descend into the $(RTEMS_BSP_FAMILY) directory
-SUBDIRS = $(RTEMS_BSP_FAMILY)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/hppa1.1/configure.in b/c/src/lib/libbsp/hppa1.1/configure.in
new file mode 100644
index 0000000000..eead2adc73
--- /dev/null
+++ b/c/src/lib/libbsp/hppa1.1/configure.in
@@ -0,0 +1,26 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(simhppa)
+RTEMS_TOP(../../../../..)
+AC_CONFIG_AUX_DIR(../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_PROJECT_ROOT
+
+RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
+AC_CONFIG_SUBDIRS($bspdir)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+Makefile)
diff --git a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
index 6d2173df2a..a1d85c4e0f 100644
--- a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
@@ -11,8 +11,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = hppa1.1/pxfl
+top_builddir = ..
+subdir = pxfl
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am
new file mode 100644
index 0000000000..932db66253
--- /dev/null
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am
@@ -0,0 +1,17 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+# from the individual .rel files built in other directories
+SUBDIRS = include start startup tty shmsupp wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
deleted file mode 100644
index 129e440e3e..0000000000
--- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = hppa1.1/simhppa
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# We only build the multiprocessing support if HAS_MP was defined
-MP_SUPPORT_yes_V = shmsupp
-MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
-
-# wrapup is the one that actually builds and installs the library
-# from the individual .rel files built in other directories
-# NOTE: we pick up HPPA clock and timer from libcpu/hppa
-SUBDIRS = tools include start startup tty $(MP_SUPPORT) wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
new file mode 100644
index 0000000000..902c705381
--- /dev/null
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
@@ -0,0 +1,37 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1-simhppa,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+RTEMS_ENABLE_MULTIPROCESSING
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS(tools)
+
+# Explicitly list a Makefile here
+AC_OUTPUT(
+Makefile
+include/Makefile
+shmsupp/Makefile
+start/Makefile
+startup/Makefile
+tty/Makefile
+wrapup/Makefile)
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
index a6326e7f1f..337180ad00 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = hppa1.1/simhppa/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am
new file mode 100644
index 0000000000..9ac9c40632
--- /dev/null
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am
@@ -0,0 +1,35 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGM = ${ARCH}/shmsupp.rel
+
+## C source names
+C_FILES = addrconv.c cause_intr.c getcfg.c lock.c mpisr.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): ${OBJS}
+ $(make-rel)
+
+if HAS_MP
+all-local: ${ARCH} $(PGM)
+else
+all-local:
+endif
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+EXTRA_DIST = $(C_FILES) README
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in
deleted file mode 100644
index 941a07d48d..0000000000
--- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = hppa1.1/simhppa/shmsupp
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-PGM = ${ARCH}/shmsupp.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = addrconv getcfg cause_intr lock mpisr
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(PGM): ${OBJS}
- $(make-rel)
-
-all: ${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install: all
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in
index 65bd681b57..40d567d3a0 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = hppa1.1/simhppa/start
+top_builddir = ..
+subdir = start
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
index 604a662892..b2c0686a31 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = hppa1.1/simhppa/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in
index 381165cf87..70a33d4260 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = hppa1.1/simhppa/tty
+top_builddir = ..
+subdir = tty
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
index 18577eb661..6aa71b4ad8 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = hppa1.1/simhppa/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -16,7 +16,6 @@ VPATH = @srcdir@
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
-INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
BSP_PIECES = startup tty
@@ -67,9 +66,6 @@ $(LIB): ${OBJS}
all: ${ARCH} $(SRCS) $(LIB)
$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
- $(INSTALL_DATA) $< $@
-
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status