From e725be085804c1c11f7b6bbcc763bc4fe164465e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 11 Dec 2003 05:41:58 +0000 Subject: 2003-12-11 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/or32/orp/ChangeLog | 6 ++++++ c/src/lib/libbsp/or32/orp/start/Makefile.am | 18 +++++++----------- c/src/lib/libbsp/or32/orp/startup/Makefile.am | 14 ++++++-------- c/src/lib/libbsp/or32/orp/wrapup/Makefile.am | 3 +-- 4 files changed, 20 insertions(+), 21 deletions(-) (limited to 'c/src/lib/libbsp/or32') diff --git a/c/src/lib/libbsp/or32/orp/ChangeLog b/c/src/lib/libbsp/or32/orp/ChangeLog index 0a648c1ed7..f737b652c6 100644 --- a/c/src/lib/libbsp/or32/orp/ChangeLog +++ b/c/src/lib/libbsp/or32/orp/ChangeLog @@ -1,3 +1,9 @@ +2003-12-11 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-02 Ralf Corsepius * startup/Makefile.am: Remove S_FILES. Cosmetics. diff --git a/c/src/lib/libbsp/or32/orp/start/Makefile.am b/c/src/lib/libbsp/or32/orp/start/Makefile.am index b0522b3e4f..7d37cb8d7d 100644 --- a/c/src/lib/libbsp/or32/orp/start/Makefile.am +++ b/c/src/lib/libbsp/or32/orp/start/Makefile.am @@ -9,24 +9,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/or32/orp/startup/Makefile.am b/c/src/lib/libbsp/or32/orp/startup/Makefile.am index 77a1deb1d5..bd8f80faef 100644 --- a/c/src/lib/libbsp/or32/orp/startup/Makefile.am +++ b/c/src/lib/libbsp/or32/orp/startup/Makefile.am @@ -22,18 +22,16 @@ include $(top_srcdir)/../../../../automake/lib.am $(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/or32/orp/wrapup/Makefile.am b/c/src/lib/libbsp/or32/orp/wrapup/Makefile.am index 4e26fceadf..7b46d546d8 100644 --- a/c/src/lib/libbsp/or32/orp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/or32/orp/wrapup/Makefile.am @@ -8,8 +8,7 @@ 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