From b3d5cde800ed574aedb936b40d8e9e6f9fc0a0f3 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 9 Dec 2003 16:21:49 +0000 Subject: 2003-12-09 Ralf Corsepius * startup/Makefile.am: Misc cleanups and fixes. * wrapup/Makefile.am: Misc cleanups and fixes. --- c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog | 5 +++++ c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am | 15 ++++++--------- c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog index b7f6f90f14..6dfda62bf3 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog +++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog @@ -1,3 +1,8 @@ +2003-12-09 Ralf Corsepius + + * startup/Makefile.am: Misc cleanups and fixes. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am index e50879e992..91ec64c09e 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am @@ -22,17 +22,14 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds +project_lib_DATA = linkcmds -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) - -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c linkcmds main.c setvec.c +${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/no_cpu/no_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am index 6cc55494a5..5d3cf045c7 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am @@ -13,8 +13,8 @@ endif BSP_FILES = startup clock console timer $(BSP_MP_O_FILES) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(GENERIC_FILES), \ +OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(GENERIC_FILES), \ ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3