From bc71412e55bf7b00367b200b1118f0fffce56172 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 11 Dec 2003 05:42:03 +0000 Subject: 2003-12-11 Ralf Corsepius * Makefile.am: Misc cleanups and fixes. * 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/sparc/leon/ChangeLog | 7 +++++++ c/src/lib/libbsp/sparc/leon/Makefile.am | 2 +- c/src/lib/libbsp/sparc/leon/start/Makefile.am | 18 +++++++----------- c/src/lib/libbsp/sparc/leon/startup/Makefile.am | 15 ++++++--------- c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog index b3ac7778b8..8fd64b0abb 100644 --- a/c/src/lib/libbsp/sparc/leon/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon/ChangeLog @@ -1,3 +1,10 @@ +2003-12-11 Ralf Corsepius + + * Makefile.am: Misc cleanups and fixes. + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-02 Ralf Corsepius * Makefile.am: Add dirstamp support to preinstallation. diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am index 215b7e7fb8..ce492f4445 100644 --- a/c/src/lib/libbsp/sparc/leon/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = . start startup gnatsupp console clock timer leon_open_eth wrapup \ include $(top_srcdir)/../../bsp.am -include_HEADERS += include/leon.h +include_HEADERS += include/leon.h include_HEADERS += include/coverhd.h all-local: $(PREINSTALL_FILES) diff --git a/c/src/lib/libbsp/sparc/leon/start/Makefile.am b/c/src/lib/libbsp/sparc/leon/start/Makefile.am index 34e7a3e364..62ebac9067 100644 --- a/c/src/lib/libbsp/sparc/leon/start/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/start/Makefile.am @@ -11,24 +11,20 @@ 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 += # -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/sparc/leon/startup/Makefile.am b/c/src/lib/libbsp/sparc/leon/startup/Makefile.am index 09d9c8ac32..3c3e7f65a6 100644 --- a/c/src/lib/libbsp/sparc/leon/startup/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/startup/Makefile.am @@ -25,17 +25,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 = linkcmds setvec.c spurious.c boardinit.S +${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/sparc/leon/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am index 50d7d4fa1b..6545aa4622 100644 --- a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am @@ -12,8 +12,8 @@ BSP_PIECES = startup console clock timer gnatsupp $(NETWORKING_DRIVER) CPU_PIECES = cache reg_win syscall # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(CPU_PIECES), \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(CPU_PIECES), \ ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3