summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/bare
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-31 15:15:10 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-31 15:15:10 +0000
commit4c46630639ab25de2a90507694d369116a26059b (patch)
treea4c5525e348e52a5e636718e9c9e2a1ff092b6cd /c/src/lib/libbsp/bare
parentSuccessfully built some RPMs. There is still a lot of work to do. (diff)
downloadrtems-4c46630639ab25de2a90507694d369116a26059b.tar.bz2
Patch rtems-rc-20000118-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that contains: * cleanups to configuration files * A reworked gccnewlib.spec.in: I have reformated it for enhanced readability and added more rtems-base packages. It now should be free of any installation conflicts (If there still remain some, they should be regarded as bugs). * A fix to the bin2boot RTEMS_BSP issue (make RTEMS_BSP="pc386 pc486" now works). * removes libbsp/bare/wrapup * Further cleanups
Diffstat (limited to 'c/src/lib/libbsp/bare')
-rw-r--r--c/src/lib/libbsp/bare/Makefile.am8
-rw-r--r--c/src/lib/libbsp/bare/configure.in2
-rw-r--r--c/src/lib/libbsp/bare/include/Makefile.am13
-rw-r--r--c/src/lib/libbsp/bare/wrapup/Makefile.in64
4 files changed, 9 insertions, 78 deletions
diff --git a/c/src/lib/libbsp/bare/Makefile.am b/c/src/lib/libbsp/bare/Makefile.am
index 4c1ea45a78..db8ee902e2 100644
--- a/c/src/lib/libbsp/bare/Makefile.am
+++ b/c/src/lib/libbsp/bare/Makefile.am
@@ -9,13 +9,7 @@ include $(top_srcdir)/../bsp.am
SUBDIRS = . include
-$(PROJECT_RELEASE)/bsp_specs: bsp_specs
- $(INSTALL_DATA) $< $@
-
-all-local : $(PREINSTALL_FILES)
-
-EXTRA_DIST = \
-build-tools bsp_specs do-bare-bsp-build
+EXTRA_DIST = bsp_specs build-tools do-bare-bsp-build
include $(top_srcdir)/../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/bare/configure.in b/c/src/lib/libbsp/bare/configure.in
index 218ce78889..517102de4b 100644
--- a/c/src/lib/libbsp/bare/configure.in
+++ b/c/src/lib/libbsp/bare/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-bare,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
-RTEMS_ENABLE_LIBCDIR
-
RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/bare/include/Makefile.am b/c/src/lib/libbsp/bare/include/Makefile.am
index 46ceb70cac..8b4b05be9d 100644
--- a/c/src/lib/libbsp/bare/include/Makefile.am
+++ b/c/src/lib/libbsp/bare/include/Makefile.am
@@ -3,13 +3,11 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
+
H_FILES = bsp.h
-noinst_HEADERS = $(H_FILES)
-TMPINSTALL_FILES += \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
-$(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_INCLUDE):
+ $(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -17,6 +15,11 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PROJECT_INCLUDE)/coverhd.h: $(srcdir)/../../shared/include/coverhd.h
$(INSTALL_DATA) $< $@
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
+ $(PROJECT_INCLUDE)/coverhd.h
+
all-local: $(TMPINSTALL_FILES)
+EXTRA_DIST = bsp.h
+
include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/bare/wrapup/Makefile.in b/c/src/lib/libbsp/bare/wrapup/Makefile.in
deleted file mode 100644
index ac79fc207a..0000000000
--- a/c/src/lib/libbsp/bare/wrapup/Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = bare/wrapup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-BSP_PIECES =
-GENERIC_PIECES =
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
- $(foreach piece, $(GENERIC_PIECES), \
- ../../../$(piece)/$(ARCH)/$(piece).rel)
-LIB = $(ARCH)/libbsp.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL = @INSTALL@
-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 +=
-
-$(LIB): ${OBJS}
- $(make-library)
-
-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