From 968b78dbc686c75d9a796bfde0f61f8f16d7b2aa Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 11 Dec 2003 04:09:16 +0000 Subject: 2003-12-11 Ralf Corsepius * start/Makefile.am: Misc cleanups and fixes. * startup/Makefile.am: Misc cleanups and fixes. --- c/src/lib/libbsp/sh/gensh2/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh2/start/Makefile.am | 16 +++++++------- c/src/lib/libbsp/sh/gensh2/startup/Makefile.am | 14 ++++++------- c/src/lib/libbsp/sh/gensh4/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh4/start/Makefile.am | 16 +++++++------- c/src/lib/libbsp/sh/gensh4/startup/Makefile.am | 29 ++++++++++++-------------- 6 files changed, 43 insertions(+), 42 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 47bcb3db9a..bec8bdf74f 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,8 @@ +2003-12-11 Ralf Corsepius + + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/sh/gensh2/start/Makefile.am b/c/src/lib/libbsp/sh/gensh2/start/Makefile.am index 7ae2ca9d6b..3b2e45f712 100644 --- a/c/src/lib/libbsp/sh/gensh2/start/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/start/Makefile.am @@ -9,22 +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) $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.S start.ram start.rom +${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/sh/gensh2/startup/Makefile.am b/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am index 0ecaf2cec6..e88b867add 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am @@ -19,20 +19,18 @@ include $(top_srcdir)/../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -bsplib_DATA = linkcmds - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds +project_lib_DATA = linkcmds $(PGM): $(OBJS) $(make-rel) -all-local: $(PREINSTALL_FILES) $(OBJS) $(PGM) $(TMPINSTALL_FILES) - -.PRECIOUS: $(PGM) +all-local: $(PREINSTALL_FILES) $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c hw_init.c linkcmds linkcmds.ram \ linkcmds.rom +${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/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index 9faec1d2bb..73f70595e5 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,8 @@ +2003-12-11 Ralf Corsepius + + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/sh/gensh4/start/Makefile.am b/c/src/lib/libbsp/sh/gensh4/start/Makefile.am index 048f639560..62fae6f2fe 100644 --- a/c/src/lib/libbsp/sh/gensh4/start/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/start/Makefile.am @@ -9,22 +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) $(TMPINSTALL_FILES) +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/sh/gensh4/startup/Makefile.am b/c/src/lib/libbsp/sh/gensh4/startup/Makefile.am index 4392685d00..ef4f22ac7c 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/startup/Makefile.am @@ -20,28 +20,25 @@ include $(top_srcdir)/../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -bsplib_DATA = linkcmds linkcmds.rom linkcmds.rom2ram - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds.rom: linkcmds.rom - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds.rom2ram: linkcmds.rom2ram - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds linkcmds.rom linkcmds.rom2ram $(PGM): $(OBJS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds.rom \ - $(PROJECT_RELEASE)/lib/linkcmds.rom2ram +all-local: $(TMPINSTALL_FILES) $(PGM) -all-local: $(TMPINSTALL_FILES) $(OBJS) $(PGM) +EXTRA_DIST = bspclean.c bspstart.c linkcmds linkcmds.rom linkcmds.rom2ram -.PRECIOUS: $(PGM) +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds -EXTRA_DIST = bspclean.c bspstart.c linkcmds linkcmds.rom linkcmds.rom2ram +${PROJECT_RELEASE}/lib/linkcmds.rom: linkcmds.rom ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds.rom +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds.rom + +${PROJECT_RELEASE}/lib/linkcmds.rom2ram: linkcmds.rom2ram ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds.rom2ram +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds.rom2ram include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3