From 914981ce7f0eafa991383428a649be454d3bbdb1 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:55:19 +0000 Subject: 2002-08-11 Ralf Corsepius * console/Makefile.am: Use .$(OBJEXT) instead of .o. * liblnk/Makefile.am: Use .$(OBJEXT) instead of .o. * start/Makefile.am: Use .$(OBJEXT) instead of .o. * startup/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. --- c/src/lib/libbsp/mips/p4000/ChangeLog | 8 ++++++++ c/src/lib/libbsp/mips/p4000/console/Makefile.am | 4 ++-- c/src/lib/libbsp/mips/p4000/liblnk/Makefile.am | 2 +- c/src/lib/libbsp/mips/p4000/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/mips/p4000/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am | 10 +++++----- c/src/lib/libbsp/mips64orion/p4000/ChangeLog | 8 ++++++++ c/src/lib/libbsp/mips64orion/p4000/console/Makefile.am | 4 ++-- c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.am | 2 +- c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am | 2 +- 12 files changed, 44 insertions(+), 28 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog index 8ecbd8c767..3334b2ed3f 100644 --- a/c/src/lib/libbsp/mips/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips/p4000/ChangeLog @@ -1,3 +1,11 @@ +2002-08-11 Ralf Corsepius + + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * liblnk/Makefile.am: Use .$(OBJEXT) instead of .o. + * start/Makefile.am: Use .$(OBJEXT) instead of .o. + * startup/Makefile.am: Use .$(OBJEXT) instead of .o. + * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. + 2002-07-21 Ralf Corsepius * start/Makefile.am: Eliminate PGM. diff --git a/c/src/lib/libbsp/mips/p4000/console/Makefile.am b/c/src/lib/libbsp/mips/p4000/console/Makefile.am index 13a252b2a1..4db4971e2f 100644 --- a/c/src/lib/libbsp/mips/p4000/console/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/console/Makefile.am @@ -6,10 +6,10 @@ PGM = $(ARCH)/console.rel C_FILES = console.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = led.S -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/mips/p4000/liblnk/Makefile.am b/c/src/lib/libbsp/mips/p4000/liblnk/Makefile.am index 721ba33f1b..e97bb45efc 100644 --- a/c/src/lib/libbsp/mips/p4000/liblnk/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/liblnk/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/liblnk.rel S_FILES = lnklib.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) diff --git a/c/src/lib/libbsp/mips/p4000/start/Makefile.am b/c/src/lib/libbsp/mips/p4000/start/Makefile.am index d00014c239..09e34051d9 100644 --- a/c/src/lib/libbsp/mips/p4000/start/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/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/mips/p4000/startup/Makefile.am b/c/src/lib/libbsp/mips/p4000/startup/Makefile.am index cfe7b4b262..3c36894b85 100644 --- a/c/src/lib/libbsp/mips/p4000/startup/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/startup/Makefile.am @@ -9,10 +9,10 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ setvec.c inittlb.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = idtmem.S idttlb.S -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/mips/p4000/wrapup/Makefile.am b/c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am index 7ee072ec54..59eb1d549c 100644 --- a/c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am @@ -10,12 +10,12 @@ 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)/*.o)) \ +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ $(foreach piece, $(CPU_FILES), \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/r46xx/*/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/r46xx/*/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog index 4a33223390..aebaf4c655 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog @@ -1,3 +1,11 @@ +2002-08-11 Ralf Corsepius + + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * liblnk/Makefile.am: Use .$(OBJEXT) instead of .o. + * start/Makefile.am: Use .$(OBJEXT) instead of .o. + * startup/Makefile.am: Use .$(OBJEXT) instead of .o. + * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. + 2002-07-21 Ralf Corsepius * start/Makefile.am: Eliminate PGM. diff --git a/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.am index 13a252b2a1..4db4971e2f 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.am @@ -6,10 +6,10 @@ PGM = $(ARCH)/console.rel C_FILES = console.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = led.S -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/mips64orion/p4000/liblnk/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.am index 721ba33f1b..e97bb45efc 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/liblnk.rel S_FILES = lnklib.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) diff --git a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am index d00014c239..09e34051d9 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/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/mips64orion/p4000/startup/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am index cfe7b4b262..3c36894b85 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am @@ -9,10 +9,10 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ setvec.c inittlb.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = idtmem.S idttlb.S -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/mips64orion/p4000/wrapup/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am index 2118985bce..ad2cf828ae 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am @@ -6,7 +6,7 @@ BSP_FILES = startup console liblnk CPU_FILES = clock timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ $(foreach piece, $(CPU_FILES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3