diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-30 13:27:37 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-30 13:27:37 +0000 |
commit | ad1abd3e361c06f47dbd62b0c0a3c7f86eaf2415 (patch) | |
tree | 6ffb6f1872895f5fcb6ab5bee716eb1216f42c8b /c/src/lib/libbsp/powerpc/score603e | |
parent | 2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-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/score603e')
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/Makefile.am | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/start/.cvsignore | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/start/Makefile.am | 31 |
5 files changed, 19 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 7780b4891c..f1e2b57177 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +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-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Add nostdinc to AUTOMAKE_OPTIONS. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 492a61ac92..0fe9b21907 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -6,17 +6,23 @@ 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 console startup start timer tod PCI_bus vectors \ - @exceptions@ wrapup +SUBDIRS = . clock console startup timer tod PCI_bus vectors @exceptions@ \ + wrapup include $(top_srcdir)/../../bsp.am include_HEADERS += include/coverhd.h include/gen2.h include_HEADERS += include/tod.h +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) PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h @@ -30,8 +36,13 @@ $(PROJECT_INCLUDE)/tod.h: include/tod.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h +$(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/score603e/configure.ac b/c/src/lib/libbsp/powerpc/score603e/configure.ac index 44a322b8cf..f0ab5bda7f 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.ac +++ b/c/src/lib/libbsp/powerpc/score603e/configure.ac @@ -74,7 +74,6 @@ AC_CONFIG_FILES([Makefile PCI_bus/Makefile clock/Makefile console/Makefile -start/Makefile startup/Makefile timer/Makefile tod/Makefile diff --git a/c/src/lib/libbsp/powerpc/score603e/start/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am deleted file mode 100644 index d4a2c8a992..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -OBJS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -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 |