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/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 +- 4 files changed, 45 insertions(+), 51 deletions(-) (limited to 'c/src/lib/libbsp/m68k/efi332') 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 -- cgit v1.2.3