diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:20:58 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:20:58 +0000 |
| commit | 94c2898085b3a93c40368d6db6b0adee0870d0af (patch) | |
| tree | 2ba4f04403141e6f9da65347cefca7d6c4af1f4b /c/src/lib/libbsp/arm/arm_bare_bsp | |
| parent | 2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-94c2898085b3a93c40368d6db6b0adee0870d0af.tar.bz2 | |
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* console/Makefile.am: Misc cleanups and fixes.
* irq/Makefile.am: Misc cleanups and fixes.
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
Diffstat (limited to 'c/src/lib/libbsp/arm/arm_bare_bsp')
6 files changed, 24 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 89c454705e..25e26c736c 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog @@ -1,3 +1,11 @@ +2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * console/Makefile.am: Misc cleanups and fixes. + * irq/Makefile.am: Misc cleanups and fixes. + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * console/Makefile.am: Remove all: $(ARCH). diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am index da92b88e50..e8b1a46260 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(console_rel_OBJECTS) $(make-rel) -all: $(console_rel_OBJECTS) $(PGM) +all-local: $(console_rel_OBJECTS) $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am index 1f70d60cc7..d5d65e112d 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am @@ -25,7 +25,7 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(irq_rel_OBJECTS) $(make-rel) -all: $(PREINSTALL_FILES) $(irq_rel_OBJECTS) $(PGM) +all-local: $(PREINSTALL_FILES) $(irq_rel_OBJECTS) $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am index 9641f42059..62fae6f2fe 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am @@ -9,24 +9,20 @@ 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 += # -install-data-local: $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - $(INSTALL_DATA) $< $(DESTDIR)$(bsplibdir) +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.S +${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am index c7396b2bab..8819775124 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am @@ -23,17 +23,14 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(startup_rel_OBJECTS) $(make-rel) -bsplib_DATA = linkcmds +project_lib_DATA = linkcmds -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds - -all: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) - -.PRECIOUS: $(PGM) +all-local: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = linkcmds +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am index 5cf8301b30..f14391330e 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am @@ -18,6 +18,6 @@ include $(top_srcdir)/../../../../automake/lib.am $(LIB): $(OBJS) $(make-library) -all: $(OBJS) $(LIB) $(TMPINSTALL_FILES) +all-local: $(LIB) include $(top_srcdir)/../../../../automake/local.am |