summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/eth_comm
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-30 13:27:37 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-30 13:27:37 +0000
commitad1abd3e361c06f47dbd62b0c0a3c7f86eaf2415 (patch)
tree6ffb6f1872895f5fcb6ab5bee716eb1216f42c8b /c/src/lib/libbsp/powerpc/eth_comm
parent2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-ad1abd3e361c06f47dbd62b0c0a3c7f86eaf2415.tar.bz2
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in start/Makefile.am. * start/Makefile.am: Remove. * configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/eth_comm')
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/ChangeLog6
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/Makefile.am26
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/configure.ac1
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am37
5 files changed, 27 insertions, 45 deletions
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
index 6ab206b62f..c4222be223 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
@@ -1,5 +1,11 @@
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * Makefile.am: Merge-in start/Makefile.am.
+ * start/Makefile.am: Remove.
+ * configure.ac: Reflect changes above.
+
+2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* wrapup/Makefile.am: Reflect changes to
../support/*exception_processing/*.
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am
index 51d81d5a33..d8980f6b87 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am
@@ -6,21 +6,32 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = . clock startup start canbus console irq network vectors \
- @exceptions@ wrapup
+SUBDIRS = . clock startup canbus console irq network vectors @exceptions@ \
+ wrapup
+include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
+
include_bspdir = $(includedir)/bsp
include_HEADERS += include/coverhd.h include/canbus.h include/info.h
include_bsp_HEADERS = include/commproc.h include/8xx_immap.h
-all-local: $(PREINSTALL_FILES)
+EXTRA_DIST = start/start.S
+start$(LIB_VARIANT).$(OBJEXT): start/start.S
+ ${CCASCOMPILE} -DASM -o $@ -c $<
+project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
-EXTRA_DIST = times
+EXTRA_DIST += times
PREINSTALL_DIRS =
+TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
@@ -47,8 +58,13 @@ $(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/8xx_immap.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
-CLEANFILES = $(PREINSTALL_FILES)
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
+CLEANFILES += $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES += $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac
index 7aa4ce700d..bbe5c582ab 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac
+++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac
@@ -44,7 +44,6 @@ canbus/Makefile
console/Makefile
irq/Makefile
network/Makefile
-start/Makefile
startup/Makefile
vectors/Makefile
wrapup/Makefile])
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am
deleted file mode 100644
index 8e096cebcd..0000000000
--- a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-##
-## $Id$
-##
-
-S_FILES = start.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(S_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-include $(top_srcdir)/../../bspstart.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = start.S
-
-TMPINSTALL_FILES =
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(mkdir_p) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(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)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am