From 92b8b98af0e387c404da0af790eaaad6acffea30 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:14:50 +0000 Subject: 2002-08-11 Ralf Corsepius * 3c509/Makefile.am: Use .$(OBJEXT) instead of .o. * clock/Makefile.am: Use .$(OBJEXT) instead of .o. * console/Makefile.am: Use .$(OBJEXT) instead of .o. * ne2000/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. * wd8003/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. --- c/src/lib/libbsp/i386/pc386/3c509/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/ChangeLog | 12 ++++++++++++ c/src/lib/libbsp/i386/pc386/clock/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/console/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/start/Makefile.am | 16 ++++++++-------- c/src/lib/libbsp/i386/pc386/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/pc386/timer/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am | 4 ++-- 10 files changed, 30 insertions(+), 18 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am index 7040090073..bce84d617d 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/3c509.rel C_FILES = 3c509.c elink.c -X3c509_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +X3c509_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = 3c509.h elink.h diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 9d7faf20b5..9803ce09cf 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,15 @@ +2002-08-11 Ralf Corsepius + + * 3c509/Makefile.am: Use .$(OBJEXT) instead of .o. + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * ne2000/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. + * wd8003/Makefile.am: Use .$(OBJEXT) instead of .o. + * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. + 2002-07-30 Ralf Corsepius * startup/ldsegs.S: #include . diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am index 1d25eccd7a..8b58f4ee57 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = ckinit.c rtc.c -clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am index 224378570f..9d19ecd93d 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.am @@ -12,7 +12,7 @@ C_FILES = console.c inch.c outch.c defkeymap.c fb_vga.c keyboard.c \ mouse_parser.c pc_keyb.c ps2_mouse.c serial_mouse.c vgainit.c vt.c S_FILES = videoAsm.S -console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) +console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am index b2f285b5f9..ca400c8351 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/ne2000.rel C_FILES = ne2000.c -ne2000_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +ne2000_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index dcae000c49..c03de07c31 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -3,7 +3,7 @@ ## S_FILES = start16.S start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) @@ -17,24 +17,24 @@ include $(top_srcdir)/../../../../../../automake/lib.am LINKCMDS = $(top_srcdir)/startup/linkcmds -bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) bsplib_DATA += $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin -$(ARCH)/start16.o: start16.S +$(ARCH)/start16.$(OBJEXT): start16.S $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $< -$(ARCH)/start16.bin: $(ARCH)/start16.o - $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o - $(OBJCOPY) -O binary $(basename $@).obj $@ +$(ARCH)/start16.bin: $(ARCH)/start16.$(OBJEXT) + $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib --oformat=elf32-i386 -o $(basename $@).$(OBJEXT)bj $(basename $@).$(OBJEXT) + $(OBJCOPY) -O binary $(basename $@).$(OBJEXT)bj $@ $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: $(ARCH)/start16.bin $(INSTALL_DATA) $< $@ -$(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/start16$(LIB_VARIANT).bin \ - $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o + $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am index b533eae453..b5819e0d23 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am @@ -11,10 +11,10 @@ C_FILES = bsplibc.c bsppost.c bspstart.c exit.c idt.c irq.c irq_init.c \ bootcard.c main.c sbrk.c i386-stub.c i386-stub-glue.c uart.c pcibios.c \ gnatinstallhandler.c gdb_glue.c tty_drv.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = ldsegs.S irq_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am index 4fc3f444b1..b538b7cd97 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am @@ -7,7 +7,7 @@ PGM = $(ARCH)/timer.rel C_FILES = timer.c S_FILES = timerisr.S -timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) +timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am index a2e89f3237..e3827df153 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/wd8003.rel C_FILES = wd8003.c -wd8003_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +wd8003_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am index fead2fd94e..41cbd4d1d6 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am @@ -11,8 +11,8 @@ endif BSP_FILES = startup clock console timer $(NETWORK) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -- cgit v1.2.3