2 files changed, 21 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/sh/gensh2/start/Makefile.am b/c/src/lib/libbsp/sh/gensh2/start/Makefile.am
index f6aeba8911..cab0be15ab 100644
--- a/c/src/lib/libbsp/sh/gensh2/start/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/start/Makefile.am
@@ -4,11 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGMS = ${ARCH}/start.o
+PGMS = $(ARCH)/start.o
 
-## Assembly source names
 S_FILES = start.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
 OBJS = $(S_O_FILES)
 
@@ -19,9 +18,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-all-local: ${ARCH} $(OBJS)
-	@$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
+$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(PGMS)
+	$(INSTALL_DATA) $< $@
 
-EXTRA_DIST = $(S_FILES)
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES)
+
+EXTRA_DIST = start.S start.ram start.rom
 
 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 9fb68d4c9d..1c39a297ed 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am
@@ -6,12 +6,11 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
 
-PGM = ${ARCH}/startup.rel
+PGM = $(ARCH)/startup.rel
 
-## C source names
 C_FILES = hw_init.c bsplibc.c bsppost.c bspstart.c bspclean.c sbrk.c \
     bootcard.c main.c gnatinstallhandler.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
@@ -22,18 +21,21 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
+AM_CPPFLAGS += -DHZ=$(HZ)
+
 $(PROJECT_RELEASE)/lib/linkcmds: linkcmds
 	$(INSTALL_DATA) $< $@
- 
-PREINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
-
-AM_CPPFLAGS += -DHZ=$(HZ)
 
-$(PGM): ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM)
+PREINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) linkcmds linkcmds.rom linkcmds.ram
+EXTRA_DIST = bspclean.c bspstart.c hw_init.c linkcmds linkcmds.ram \
+    linkcmds.rom
 
 include $(top_srcdir)/../../../../../../automake/local.am