From 4d5d97b3aefd1bff1c1222b95942ff1c5595bec1 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 10 Dec 2003 12:37:33 +0000 Subject: 2003-12-10 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/m68k/dmv152/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/dmv152/start/Makefile.am | 16 ++---- c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am | 15 ++--- c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/efi332/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/efi332/start/Makefile.am | 64 +++++++++------------- c/src/lib/libbsp/m68k/efi332/startup/Makefile.am | 22 ++++---- c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/efi68k/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/efi68k/start/Makefile.am | 22 +++----- c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/gen68302/start/Makefile.am | 18 +++--- c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/gen68340/start/Makefile.am | 18 +++--- c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/gen68360/start/Makefile.am | 18 +++--- c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am | 30 +++++----- c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/idp/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/idp/start/Makefile.am | 16 ++---- c/src/lib/libbsp/m68k/idp/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/mrm332/start/Makefile.am | 18 +++--- c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am | 27 ++++----- c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/mvme136/start/Makefile.am | 16 ++---- c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am | 8 +-- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/mvme147/start/Makefile.am | 20 ++----- c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am | 16 ++---- c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am | 8 +-- c/src/lib/libbsp/m68k/ods68302/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/ods68302/start/Makefile.am | 18 +++--- c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am | 29 +++++----- c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am | 4 +- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 6 ++ c/src/lib/libbsp/m68k/sim68000/start/Makefile.am | 22 +++----- c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am | 14 ++--- c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am | 4 +- 52 files changed, 316 insertions(+), 339 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog index defa0d118a..c59bda6a04 100644 --- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog +++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/dmv152/start/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/start/Makefile.am index 1082c32802..fa4e05cca4 100644 --- a/c/src/lib/libbsp/m68k/dmv152/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/start/Makefile.am @@ -11,22 +11,18 @@ 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) $< $@ +all-local: $(TMPINSTALL_FILES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +${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/m68k/dmv152/startup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am index 3f09660ef8..7d121e6113 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am @@ -23,17 +23,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 = bspclean.c bspstart.c linkcmds vmeintr.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/m68k/dmv152/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am index 15833e5d71..d707e0a6b7 100644 --- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog index ca5688ee47..9321f42220 100644 --- a/c/src/lib/libbsp/m68k/efi332/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi332/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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-04 Ralf Corsepius * startup/Makefile.am: Remove S_FILES. diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am index 1a4e2a24ee..ec1b56564a 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am @@ -3,69 +3,59 @@ ## C_FILES = start.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%$(LIB_VARIANT).$(OBJEXT)) S_FILES = except_vect_332_ROM.S -OBJS += $(S_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS += $(S_FILES:%.c=$(ARCH)/%$(LIB_VARIANT).$(OBJEXT)) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../../bspstart.am # # (OPTIONAL) Add local stuff here using += # -START_O_FILES = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) -START_O_FILES += \ - $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) -START_O_FILES += $(PROJECT_RELEASE)/lib/ram_init$(LIB_VARIANT) -START_O_FILES += $(PROJECT_RELEASE)/lib/ram_init_FW$(LIB_VARIANT) +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += $(ARCH)/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += $(ARCH)/ram_init$(LIB_VARIANT) +project_lib_DATA += $(ARCH)/ram_init_FW$(LIB_VARIANT) -install-data-local: $(START_O_FILES) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - list='$(START_O_FILES)'; for i in $$list; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(bsplibdir); \ - done - -$(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT): \ - $(ARCH)/except_vect_332_ROM.$(OBJEXT) - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/ram_init$(LIB_VARIANT): $(ARCH)/ram_init - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/ram_init_FW$(LIB_VARIANT): $(ARCH)/ram_init_FW - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) - $(INSTALL_DATA) $< $@ - -$(ARCH)/ram_init: $(srcdir)/start.c $(srcdir)/ram_init.ld $(srcdir)/ram_init.sed +$(ARCH)/ram_init$(LIB_VARIANT): $(srcdir)/start.c $(srcdir)/ram_init.ld $(srcdir)/ram_init.sed $(ARCH)/$(dirstamp) sed -f $(srcdir)/ram_init.sed $(srcdir)/start.c >$(ARCH)/ram_init.S $(CC) -D SIM_CRB=0x0000 -E $(ARCH)/ram_init.S >$(ARCH)/ram_init1.S sed "/.$(OBJEXT)rg/ {N; s/\n/%/; P;}; /\.text/P; D;" $(ARCH)/ram_init1.S | \ sort | sed "h;1{s/.*/.data/;P;g;};s/%.*//;P;g;s/.*%//;" \ >$(ARCH)/ram_init2.S $(CC) -nostdlib -Wl,-T$(srcdir)/ram_init.ld $(ARCH)/ram_init2.S \ - -o $(ARCH)/ram_init + -o $(ARCH)/ram_init$(LIB_VARIANT) -$(ARCH)/ram_init_FW: $(srcdir)/ram_init.ld $(ARCH)/ram_init.S +$(ARCH)/ram_init_FW$(LIB_VARIANT): $(srcdir)/ram_init.ld $(ARCH)/ram_init.S $(ARCH)/$(dirstamp) $(CC) -D FLASHWRITE -D SIM_CRB=0x0000 -E $(ARCH)/ram_init.S \ >$(ARCH)/ram_init_FW1.S sed "/.$(OBJEXT)rg/ {N; s/\n/%/; P;}; /\.text/P; D;" $(ARCH)/ram_init_FW1.S | \ sort | sed "h;1{s/.*/.data/;P;g;};s/%.*//;P;g;s/.*%//;" \ >$(ARCH)/ram_init_FW2.S $(CC) -nostdlib -Wl,-T$(srcdir)/ram_init.ld $(ARCH)/ram_init_FW2.S \ - -o $(ARCH)/ram_init_FW + -o $(ARCH)/ram_init_FW$(LIB_VARIANT) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) \ - $(PROJECT_RELEASE)/lib/ram_init$(LIB_VARIANT) \ - $(PROJECT_RELEASE)/lib/ram_init_FW$(LIB_VARIANT) \ - $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) +all-local: $(TMPINSTALL_FILES) -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) +EXTRA_DIST = start.c except_vect_332_ROM.S ram_init.ld ram_init.sed -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +${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) -EXTRA_DIST = start.c except_vect_332_ROM.S ram_init.ld ram_init.sed +${PROJECT_RELEASE}/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT): $(ARCH)/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) + +${PROJECT_RELEASE}/lib/ram_init$(LIB_VARIANT): $(ARCH)/ram_init$(LIB_VARIANT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/ram_init$(LIB_VARIANT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/ram_init$(LIB_VARIANT) + +${PROJECT_RELEASE}/lib/ram_init_FW$(LIB_VARIANT): $(ARCH)/ram_init_FW$(LIB_VARIANT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/ram_init_FW$(LIB_VARIANT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/ram_init_FW$(LIB_VARIANT) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am index 4b955a11e2..aec73c1da1 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am @@ -22,22 +22,20 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds linkcmds_ROM - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds_ROM: linkcmds_ROM - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds linkcmds_ROM # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds_ROM - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c linkcmds linkcmds_ROM +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + +${PROJECT_RELEASE}/lib/linkcmds_ROM: linkcmds_ROM ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds_ROM +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds_ROM + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am index 0103f7dbca..3412c8529a 100644 --- a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog index 9e580da898..409add95f1 100644 --- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi68k/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/efi68k/start/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am index 692a02563b..368ee00997 100644 --- a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am @@ -9,24 +9,16 @@ OBJS = $(C_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 += -# +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -install-data-local: $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - $(INSTALL_DATA) $< $(DESTDIR)$(bsplibdir) - -$(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.c +${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/m68k/efi68k/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am index 9e708f80e3..3f3c9d42bf 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am @@ -23,19 +23,17 @@ 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 efi68k_tcp.c efi68k_wd.c linkcmds \ m68k-stub.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 diff --git a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am index 0103f7dbca..3412c8529a 100644 --- a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 1b725446ec..8eebaf9636 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/gen68302/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.am index 9641f42059..62fae6f2fe 100644 --- a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68302/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am index 3817eec220..90952b3651 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/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 linkcmds +${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/m68k/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am index fadcd71038..11b4829271 100644 --- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am @@ -10,8 +10,8 @@ endif BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 0c8b0085fd..eba34ff4be 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/gen68340/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am index 9e9874dbf9..7e1dca2d4c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/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 startfor340only.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/m68k/gen68340/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am index 1fd7eb2dae..4cd5208f46 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am @@ -23,18 +23,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 dumpanic.c init68340.c linkcmds +${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/m68k/gen68340/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am index 925d05c3e2..049c7413ec 100644 --- a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 9027dec26f..2384167869 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/gen68360/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.am index 9641f42059..62fae6f2fe 100644 --- a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/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/m68k/gen68360/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am index 92f9804ba5..4da728ab36 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am @@ -26,27 +26,25 @@ AM_CPPFLAGS += -I@srcdir@/../../shared/gdbstub $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds linkcmds.prom linkcmds.bootp - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds.prom: linkcmds.prom - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds.bootp: linkcmds.bootp - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds linkcmds.prom linkcmds.bootp # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds.prom \ - $(PROJECT_RELEASE)/lib/linkcmds.bootp - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = alloc360.c bspclean.c bspstart.c init68360.c linkcmds \ linkcmds.bootp linkcmds.prom +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + +${PROJECT_RELEASE}/lib/linkcmds.prom: linkcmds.prom ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds.prom +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds.prom + +${PROJECT_RELEASE}/lib/linkcmds.bootp: linkcmds.bootp ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds.bootp +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds.bootp + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am index f74c3a9b7f..7af8c5028a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am @@ -10,8 +10,8 @@ endif BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 741cd60538..998a17790f 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/idp/start/Makefile.am b/c/src/lib/libbsp/m68k/idp/start/Makefile.am index 1082c32802..fa4e05cca4 100644 --- a/c/src/lib/libbsp/m68k/idp/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/start/Makefile.am @@ -11,22 +11,18 @@ 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) $< $@ +all-local: $(TMPINSTALL_FILES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +${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/m68k/idp/startup/Makefile.am b/c/src/lib/libbsp/m68k/idp/startup/Makefile.am index d45753c799..ee4b7c3bf9 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/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 = bspstart.c linkcmds +${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/m68k/idp/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am index 1e0728d2fe..c899f94a79 100644 --- a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 0c337cda29..8c66252d1a 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/mrm332/start/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am index 9641f42059..62fae6f2fe 100644 --- a/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/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/m68k/mrm332/startup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am index 6a2bd1337a..6584f30e06 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am @@ -25,28 +25,21 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds linkcmds_ROM - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds_ROM: linkcmds_ROM - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT): \ - $(ARCH)/except_vect_332_ROM.$(OBJEXT) - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds linkcmds_ROM # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds_ROM \ - $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) - -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c except_vect_332_ROM.S linkcmds \ linkcmds_ROM +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + +${PROJECT_RELEASE}/lib/linkcmds_ROM: linkcmds_ROM ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds_ROM +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds_ROM + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am index 0103f7dbca..3412c8529a 100644 --- a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 2bc56b91aa..e14b3358d2 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/mvme136/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am index 1082c32802..fa4e05cca4 100644 --- a/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am @@ -11,22 +11,18 @@ 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) $< $@ +all-local: $(TMPINSTALL_FILES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +${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/m68k/mvme136/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am index 3817eec220..90952b3651 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/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 linkcmds +${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/m68k/mvme136/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am index 4ec222828e..c69d351138 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am @@ -16,10 +16,10 @@ endif BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(foreach \ - piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 8a7e57218c..a983519663 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/mvme147/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am index 1082c32802..e27103d601 100644 --- a/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am @@ -11,22 +11,14 @@ 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 += -# +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -install-data-local: $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - $(INSTALL_DATA) $< $(DESTDIR)$(bsplibdir) +all-local: $(TMPINSTALL_FILES) -$(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) +${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/m68k/mvme147/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am index 3817eec220..90952b3651 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/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 linkcmds +${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/m68k/mvme147/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am index 1e0728d2fe..c899f94a79 100644 --- a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index 8ae4e0a182..113e932686 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/mvme147s/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am index 1082c32802..fa4e05cca4 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am @@ -11,22 +11,18 @@ 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) $< $@ +all-local: $(TMPINSTALL_FILES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +${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/m68k/mvme147s/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am index d3e281aa97..4654adc774 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/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 = bspstart.c linkcmds +${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/m68k/mvme147s/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am index 4ec222828e..c69d351138 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am @@ -16,10 +16,10 @@ endif BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(foreach \ - piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index ec171065b9..604c7bfb9c 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/ods68302/start/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.am index 1cffe207ee..44eb1d4708 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.am @@ -16,6 +16,7 @@ OBJS = $(S_O_FILES) $(C_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 += @@ -23,22 +24,17 @@ include $(top_srcdir)/../../../../automake/lib.am AM_CFLAGS += $(CFLAGS_V) -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) $(ARCH)/start.$(OBJEXT): $(OBJS) cp $(S_O_FILES) $(ARCH)/start.$(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 = cpuboot.c debugreset.S reset.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/m68k/ods68302/startup/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am index 3071cdd01d..2a8e590d70 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am @@ -24,26 +24,25 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds rom debugger - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/rom: rom - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/debugger: debugger - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds rom debugger # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/rom $(PROJECT_RELEASE)/lib/debugger - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c crc.c debugger debugport.c gdb-hooks.c \ linkcmds m68302scc.c m68k-stub.c memcheck.c rom trace.c +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + +${PROJECT_RELEASE}/lib/rom: rom ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/rom +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/rom + +${PROJECT_RELEASE}/lib/debugger: debugger ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/debugger +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/debugger + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am index 6c52ec02a0..01d65fe337 100644 --- a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 905f08e16f..41f9eda5cc 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/sim68000/start/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/start/Makefile.am index 9641f42059..8aaa5ff859 100644 --- a/c/src/lib/libbsp/m68k/sim68000/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/start/Makefile.am @@ -9,24 +9,16 @@ 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 += -# +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -install-data-local: $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - $(INSTALL_DATA) $< $(DESTDIR)$(bsplibdir) - -$(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/m68k/sim68000/startup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am index f0f983c2e3..1fc0f75d73 100644 --- a/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am @@ -23,18 +23,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/m68k/sim68000/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am index c2ba8c6c7f..efadc43769 100644 --- a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/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)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ -- cgit v1.2.3