From 4c01fce6af60bfda3d901d50cbb3dac8d5957e4d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:43:01 +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/mrm332/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mrm332/console/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mrm332/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am | 10 +++++----- c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am | 4 ++-- 8 files changed, 27 insertions(+), 17 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 767fac1262..39428401b2 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/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/mrm332/clock/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am index 9971dae61c..efd98a00a4 100644 --- a/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/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/mrm332/console/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am index 752ac2ffda..cb5efb2be5 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/console.rel C_FILES = console.c sci.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) H_FILES = sci.h diff --git a/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am index df4e147413..2f77a0e10d 100644 --- a/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/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/mrm332/start/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am index d00014c239..09e34051d9 100644 --- a/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am @@ -3,7 +3,7 @@ ## S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_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.S diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am index 47c5b2742b..c31ee73d7f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am @@ -9,10 +9,10 @@ PGM = $(ARCH)/startup.rel C_FILES = start_c.c 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 = except_vect_332_ROM.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) $(S_O_FILES) @@ -38,14 +38,14 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(PROJECT_RELEASE)/lib/linkcmds_ROM: linkcmds_ROM $(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) $< $@ # 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).o + $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am index 7ee76eb7cc..70a4aa569b 100644 --- a/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/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/mrm332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am index 7f7ba63e87..6a6b787a60 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)/*.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