From 41d6d05cd162d3c31551d81cb1671ac1916fd2ad Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:37:17 +0000 Subject: 2002-08-11 Ralf Corsepius * clock/Makefile.am: Use .$(OBJEXT) instead of .o. * console/Makefile.am: Use .$(OBJEXT) instead of .o. * spurious/Makefile.am: Use .$(OBJEXT) instead of .o. * start/Makefile.am: Use .$(OBJEXT) instead of .o. * startup/Makefile.am: Use .$(OBJEXT) instead of .o. * timer/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. --- c/src/lib/libbsp/m68k/efi332/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/efi332/clock/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi332/console/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi332/start/Makefile.am | 24 +++++++++++------------ c/src/lib/libbsp/m68k/efi332/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi332/timer/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi68k/console/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi68k/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am | 2 +- c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am | 4 ++-- 16 files changed, 53 insertions(+), 33 deletions(-) diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog index 628f954adc..2c8d42701e 100644 --- a/c/src/lib/libbsp/m68k/efi332/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi332/ChangeLog @@ -1,3 +1,13 @@ +2002-08-11 Ralf Corsepius + + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * spurious/Makefile.am: Use .$(OBJEXT) instead of .o. + * start/Makefile.am: Use .$(OBJEXT) instead of .o. + * startup/Makefile.am: Use .$(OBJEXT) instead of .o. + * timer/Makefile.am: Use .$(OBJEXT) instead of .o. + * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. + 2002-08-05 Joel Sherrill * Per PR260 eliminate use of make-target-options. This impacted diff --git a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am index 9971dae61c..efd98a00a4 100644 --- a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = ckinit.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi332/console/Makefile.am b/c/src/lib/libbsp/m68k/efi332/console/Makefile.am index cb88cbdb35..cdf040e038 100644 --- a/c/src/lib/libbsp/m68k/efi332/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/console/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/console.rel C_FILES = console.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am index df4e147413..2f77a0e10d 100644 --- a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/spurious.rel C_FILES = spinit.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am index 896452d7a3..ac9c0cf1a6 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am @@ -3,7 +3,7 @@ ## C_FILES = start.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) @@ -15,16 +15,16 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o -bsplib_DATA += $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).o +bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) +bsplib_DATA += $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) bsplib_DATA += $(PROJECT_RELEASE)/lib/ram_init$(LIB_VARIANT) bsplib_DATA += $(PROJECT_RELEASE)/lib/ram_init_FW$(LIB_VARIANT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) $(INSTALL_DATA) $< $@ -$(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).o: \ - $(ARCH)/except_vect_332_ROM.o +$(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): \ @@ -39,7 +39,7 @@ $(ARCH)/ram_init: $(srcdir)/start.c $(srcdir)/ram_init.ld \ $(srcdir)/ram_init.sed 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 "/.org/ {N; s/\n/%/; P;}; /\.text/P; D;" $(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 \ @@ -48,20 +48,20 @@ $(ARCH)/ram_init: $(srcdir)/start.c $(srcdir)/ram_init.ld \ $(ARCH)/ram_init_FW: $(srcdir)/ram_init.ld $(ARCH)/ram_init.S $(CC) -D FLASHWRITE -D SIM_CRB=0x0000 -E $(ARCH)/ram_init.S \ >$(ARCH)/ram_init_FW1.S - sed "/.org/ {N; s/\n/%/; P;}; /\.text/P; D;" $(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 -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o \ +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).o + $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) -all-local: $(ARCH) $(OBJS) $(ARCH)/start.o $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) -.PRECIOUS: $(ARCH)/start.o +.PRECIOUS: $(ARCH)/start.$(OBJEXT) EXTRA_DIST = start.c except_vect_332_ROM.S ram_init.ld ram_init.sed diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am index b6ce7d91aa..bb572dcf8c 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am @@ -9,10 +9,10 @@ PGM = $(ARCH)/startup.rel C_FILES = bsplibc.c bsppost.c bspstart.c bspclean.c bootcard.c \ m68kpretaskinghook.c main.c sbrk.c setvec.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) $(S_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am index 7ee76eb7cc..70a4aa569b 100644 --- a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/timer.rel C_FILES = timer.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am index 7f7ba63e87..6a6b787a60 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)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog index 9f76f54e43..ba7de2a949 100644 --- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi68k/ChangeLog @@ -1,3 +1,13 @@ +2002-08-11 Ralf Corsepius + + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * spurious/Makefile.am: Use .$(OBJEXT) instead of .o. + * start/Makefile.am: Use .$(OBJEXT) instead of .o. + * startup/Makefile.am: Use .$(OBJEXT) instead of .o. + * timer/Makefile.am: Use .$(OBJEXT) instead of .o. + * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. + 2002-08-05 Joel Sherrill * Per PR260 eliminate use of make-target-options. This impacted diff --git a/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am index 9971dae61c..efd98a00a4 100644 --- a/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = ckinit.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am index cb88cbdb35..cdf040e038 100644 --- a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/console.rel C_FILES = console.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am index df4e147413..2f77a0e10d 100644 --- a/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/spurious.rel C_FILES = spinit.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am index c12bf7aa1b..2eaae7053f 100644 --- a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am @@ -3,7 +3,7 @@ ## C_FILES = start.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) @@ -15,16 +15,16 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) -all-local: $(ARCH) $(OBJS) $(ARCH)/start.o $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) -.PRECIOUS: $(ARCH)/start.o +.PRECIOUS: $(ARCH)/start.$(OBJEXT) EXTRA_DIST = start.c diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am index 888db3f99f..2afcc76ece 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am @@ -10,7 +10,7 @@ PGM = $(ARCH)/startup.rel C_FILES = bsplibc.c bsppost.c bspstart.c bspclean.c efi68k_tcp.c efi68k_wd.c \ bootcard.c m68kpretaskinghook.c main.c sbrk.c setvec.c \ gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am index 7ee76eb7cc..70a4aa569b 100644 --- a/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/timer.rel C_FILES = timer.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am index 7f7ba63e87..6a6b787a60 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)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -- cgit v1.2.3