From 0456f9ebec8c461ce0183c89b4b1f08edcca6023 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 9 Dec 2003 14:21:11 +0000 Subject: 2003-12-09 Ralf Corsepius * start/Makefile.am: Misc cleanups and fixes. * startup/Makefile.am: Misc cleanups and fixes. * wrapup/Makefile.am: Misc cleanups and fixes. --- c/src/lib/libbsp/arm/armulator/ChangeLog | 6 ++++++ c/src/lib/libbsp/arm/armulator/start/Makefile.am | 18 +++++++----------- c/src/lib/libbsp/arm/armulator/startup/Makefile.am | 14 ++++++-------- c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'c/src/lib/libbsp/arm/armulator') diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog index 0c3c279a77..d73609ebe4 100644 --- a/c/src/lib/libbsp/arm/armulator/ChangeLog +++ b/c/src/lib/libbsp/arm/armulator/ChangeLog @@ -1,3 +1,9 @@ +2003-12-09 Ralf Corsepius + + * start/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 * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/arm/armulator/start/Makefile.am b/c/src/lib/libbsp/arm/armulator/start/Makefile.am index 51d697ffb1..b72d31eaf3 100644 --- a/c/src/lib/libbsp/arm/armulator/start/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/start/Makefile.am @@ -9,6 +9,7 @@ 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 += @@ -22,19 +23,14 @@ include $(top_srcdir)/../../../../automake/lib.am # to create the program's environment. AM_CPPFLAGS += -DARM_RDI_MONITOR -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) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.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/arm/armulator/startup/Makefile.am b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am index 158d380190..e46ea18293 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am @@ -32,18 +32,16 @@ AM_CPPFLAGS += -DARM_RDI_MONITOR $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds # 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) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c exit.c linkcmds 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/arm/armulator/wrapup/Makefile.am b/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am index 4e26fceadf..2bea4bc711 100644 --- a/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am @@ -8,8 +8,8 @@ include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ $(foreach piece, $(GENERIC_FILES), \ ../../../$(piece)/$(ARCH)/$(piece).rel) -- cgit v1.2.3