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

* Makefile.am: Misc cleanups and fixes.
	* startup/Makefile.am: Misc cleanups and fixes.
	* wrapup/Makefile.am: Misc cleanups and fixes.
This commit is contained in:
Ralf Corsepius
2003-12-09 14:52:12 +00:00
parent 7c2239fe08
commit 82706f2154
4 changed files with 15 additions and 12 deletions

View File

@@ -1,3 +1,9 @@
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Misc cleanups and fixes.
* 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

@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
# wrapup is the one that actually builds and installs the library # wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories # from the individual .rel files built in other directories
SUBDIRS = . clock console irq network ide startup vectors @exceptions@ \ SUBDIRS = . clock console irq network ide startup vectors @exceptions@ \
wrapup wrapup
include $(top_srcdir)/../../bsp.am include $(top_srcdir)/../../bsp.am

View File

@@ -25,18 +25,16 @@ 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
$(INSTALL_DATA) $< $@
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) all-local: $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
EXTRA_DIST = bspstart.c imbx8xx.c linkcmds mmutlbtab.c setvec.c EXTRA_DIST = bspstart.c imbx8xx.c linkcmds mmutlbtab.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,9 +13,8 @@ BSP_PIECES = clock irq ide startup console vectors $(NETWORKING)
# mpc8xx/mmu mpc8xx/timer mpc8xx/vectors # mpc8xx/mmu mpc8xx/timer mpc8xx/vectors
# 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_PIECES), $(wildcard \ OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \ ../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \
../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.$(OBJEXT)) ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libbsp.a LIB = $(ARCH)/libbsp.a