summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/sparc/leon
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-05 06:37:25 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-05 06:37:25 +0000
commit356d53f7001c77cfa55772b3e5bad09d7cf510cf (patch)
treef25721f86fdea2c26c7fa6f7de76f305f25083ab /c/src/lib/libbsp/sparc/leon
parent2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-356d53f7001c77cfa55772b3e5bad09d7cf510cf.tar.bz2
2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Remove. * Makefile.am: Merge-in start/Makefile.am. * configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon')
-rw-r--r--c/src/lib/libbsp/sparc/leon/ChangeLog6
-rw-r--r--c/src/lib/libbsp/sparc/leon/Makefile.am22
-rw-r--r--c/src/lib/libbsp/sparc/leon/configure.ac1
-rw-r--r--c/src/lib/libbsp/sparc/leon/start/Makefile.am32
4 files changed, 23 insertions, 38 deletions
diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog
index 0e4eae5c1a..6fd588310a 100644
--- a/c/src/lib/libbsp/sparc/leon/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon/ChangeLog
@@ -1,5 +1,11 @@
2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * start/Makefile.am: Remove.
+ * Makefile.am: Merge-in start/Makefile.am.
+ * configure.ac: Reflect changes above.
+
+2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* wrapup/Makefile.am: Eliminate $(LIB).
Use noinst_DATA to trigger building libbsp.a.
diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am
index ce492f4445..41ddb58b7c 100644
--- a/c/src/lib/libbsp/sparc/leon/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/Makefile.am
@@ -4,20 +4,28 @@
ACLOCAL_AMFLAGS = -I ../../../../aclocal
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../bsp.am
+
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = . start startup gnatsupp console clock timer leon_open_eth wrapup \
- tools
-
-include $(top_srcdir)/../../bsp.am
+SUBDIRS = . startup gnatsupp console clock timer leon_open_eth wrapup tools
include_HEADERS += include/leon.h
include_HEADERS += include/coverhd.h
-all-local: $(PREINSTALL_FILES)
+sparc_shared_S_FILES = $(top_srcdir)/../../sparc/shared/start.S
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../../sparc/shared/start.S $(ARCH)/$(dirstamp)
+ ${CCASCOMPILE} -DASM -o $@ -c $<
+
+project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
EXTRA_DIST = times
+TMPINSTALL_FILES =
+
$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h
@@ -26,5 +34,9 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/leon/configure.ac b/c/src/lib/libbsp/sparc/leon/configure.ac
index 56e2557b0f..0741054e0f 100644
--- a/c/src/lib/libbsp/sparc/leon/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon/configure.ac
@@ -42,7 +42,6 @@ clock/Makefile
console/Makefile
leon_open_eth/Makefile
gnatsupp/Makefile
-start/Makefile
startup/Makefile
timer/Makefile
wrapup/Makefile])
diff --git a/c/src/lib/libbsp/sparc/leon/start/Makefile.am b/c/src/lib/libbsp/sparc/leon/start/Makefile.am
deleted file mode 100644
index bf3b3b7358..0000000000
--- a/c/src/lib/libbsp/sparc/leon/start/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## $Id$
-##
-
-S_FILES = $(top_srcdir)/../shared/start.S
-S_O_FILES = $(S_FILES:$(top_srcdir)/../shared/%.S=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(S_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
-
-$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../shared/%.S $(ARCH)/$(dirstamp)
- ${CCASCOMPILE} -DASM -o $@ -c $<
-
-all-local: $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(mkdir_p) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-
-include $(top_srcdir)/../../../../automake/local.am