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/psim | |
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/psim')
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/Makefile.am | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/start/.cvsignore | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/start/Makefile.am | 37 |
5 files changed, 19 insertions, 42 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index bfcab8466e..1cef479142 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/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/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 85ad64ccd2..2511e7f146 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -6,23 +6,34 @@ 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 = . start clock console startup shmsupp timer vectors @exceptions@ \ - wrapup tools +SUBDIRS = . clock console startup shmsupp timer vectors @exceptions@ wrapup \ + tools include $(top_srcdir)/../../bsp.am include_HEADERS += include/coverhd.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 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.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/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index 3b05b1a6d1..347443737d 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -39,7 +39,6 @@ AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile shmsupp/Makefile -start/Makefile startup/Makefile timer/Makefile vectors/Makefile diff --git a/c/src/lib/libbsp/powerpc/psim/start/.cvsignore b/c/src/lib/libbsp/powerpc/psim/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/start/Makefile.am b/c/src/lib/libbsp/powerpc/psim/start/Makefile.am deleted file mode 100644 index 8e096cebcd..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/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 |