From 758629c23cb22d5044bf52a21fd123999dc63598 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 11 Dec 2003 04:09:26 +0000 Subject: 2003-12-11 Ralf Corsepius * clock/Makefile.am: Misc cleanups and fixes. * start/Makefile.am: Misc cleanups and fixes. * startup/Makefile.am: Misc cleanups and fixes. * timer/Makefile.am: Misc cleanups and fixes. --- c/src/lib/libbsp/sh/simsh4/ChangeLog | 7 ++++++ c/src/lib/libbsp/sh/simsh4/clock/Makefile.am | 2 +- c/src/lib/libbsp/sh/simsh4/start/Makefile.am | 16 ++++++------- c/src/lib/libbsp/sh/simsh4/startup/Makefile.am | 31 ++++++++++++-------------- c/src/lib/libbsp/sh/simsh4/timer/Makefile.am | 2 +- 5 files changed, 30 insertions(+), 28 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog index d10036ddfa..8e90d186bb 100644 --- a/c/src/lib/libbsp/sh/simsh4/ChangeLog +++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog @@ -1,3 +1,10 @@ +2003-12-11 Ralf Corsepius + + * clock/Makefile.am: Misc cleanups and fixes. + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + * timer/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/simsh4/clock/Makefile.am b/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am index b1ef900536..01bde7b3e4 100644 --- a/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am @@ -21,7 +21,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all: $(ARCH) $(OBJS) $(PGM) +all-local: $(OBJS) $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/sh/simsh4/start/Makefile.am b/c/src/lib/libbsp/sh/simsh4/start/Makefile.am index 10df9bf9f1..5ee26df70f 100644 --- a/c/src/lib/libbsp/sh/simsh4/start/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/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 trap.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/simsh4/startup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am index 2772f2f111..3fe2801789 100644 --- a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am @@ -19,29 +19,26 @@ include $(top_srcdir)/../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -bsplib_DATA = linkcmds linkcmds-le linkcmds-le.coff - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds-le: linkcmds-le - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds-le.coff: linkcmds-le.coff - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds linkcmds-le linkcmds-le.coff $(PGM): $(OBJS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds-le \ - $(PROJECT_RELEASE)/lib/linkcmds-le.coff - -all-local: $(TMPINSTALL_FILES) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) +all-local: $(TMPINSTALL_FILES) $(PGM) EXTRA_DIST = bspclean.c bspstart.c hw_init.c linkcmds linkcmds-le \ linkcmds-le.coff +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + +${PROJECT_RELEASE}/lib/linkcmds-le: linkcmds-le ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds-le +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds-le + +${PROJECT_RELEASE}/lib/linkcmds-le.coff: linkcmds-le.coff ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds-le.coff +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds-le.coff + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am index 35c11ffebf..b8936c11d2 100644 --- a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am @@ -23,7 +23,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all: $(ARCH) $(OBJS) $(PGM) +all-local: $(OBJS) $(PGM) .PRECIOUS: $(PGM) -- cgit v1.2.3