2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* startup/Makefile.am: Misc cleanups and fixes.
	* wrapup/Makefile.am: Misc cleanups and fixes.
This commit is contained in:
Ralf Corsepius
2003-12-09 16:21:49 +00:00
parent e9057ed7a9
commit b3d5cde800
3 changed files with 13 additions and 11 deletions

View File

@@ -1,3 +1,8 @@
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add preinstallation dirstamp support. * Makefile.am: Add preinstallation dirstamp support.

View File

@@ -22,17 +22,14 @@ include $(top_srcdir)/../../../../automake/lib.am
$(PGM): $(OBJS) $(PGM): $(OBJS)
$(make-rel) $(make-rel)
bsplib_DATA = linkcmds project_lib_DATA = linkcmds
$(PROJECT_RELEASE)/lib/linkcmds: linkcmds all-local: $(PGM) $(TMPINSTALL_FILES)
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
EXTRA_DIST = bspclean.c bspstart.c linkcmds main.c setvec.c 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 include $(top_srcdir)/../../../../automake/local.am

View File

@@ -13,8 +13,8 @@ endif
BSP_FILES = startup clock console timer $(BSP_MP_O_FILES) BSP_FILES = startup clock console timer $(BSP_MP_O_FILES)
# bummer; have to use $foreach since % pattern subst rules only replace 1x # bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(GENERIC_FILES), \ $(foreach piece, $(GENERIC_FILES), \
../../../$(piece)/$(ARCH)/$(piece).rel) ../../../$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a LIB = $(ARCH)/libbsp.a