From 61f1ba5ce0c27c47bfba0da2483f5dc91a3669f4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 07:03:53 +0000 Subject: 2002-08-11 Ralf Corsepius * clock/Makefile.am: Use .$(OBJEXT) instead of .o. * console/Makefile.am: Use .$(OBJEXT) instead of .o. * network/Makefile.am: Use .$(OBJEXT) instead of .o. * nvram/Makefile.am: Use .$(OBJEXT) instead of .o. * pci/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. * tod/Makefile.am: Use .$(OBJEXT) instead of .o. * universe/Makefile.am: Use .$(OBJEXT) instead of .o. * vectors/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. --- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 15 +++++++++++++++ c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 2 +- 13 files changed, 33 insertions(+), 18 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 1d365f0508..41f584c883 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,18 @@ +2002-08-11 Ralf Corsepius + + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * network/Makefile.am: Use .$(OBJEXT) instead of .o. + * nvram/Makefile.am: Use .$(OBJEXT) instead of .o. + * pci/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. + * tod/Makefile.am: Use .$(OBJEXT) instead of .o. + * universe/Makefile.am: Use .$(OBJEXT) instead of .o. + * vectors/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/powerpc/ppcn_60x/clock/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am index 81d1deee68..5f9ae65224 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = clock.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/powerpc/ppcn_60x/console/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am index 89a0780a3c..c3468b4368 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/console.rel C_FILES = console.c i8042vga.c i8042.c ns16550cfg.c z85c30cfg.c vga.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/powerpc/ppcn_60x/network/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am index 790762c7fa..0a50a32665 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/network.rel C_FILES = amd79c970.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/powerpc/ppcn_60x/nvram/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am index 19604b1135..5b0791272b 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/nvram.rel C_FILES = nvram.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/powerpc/ppcn_60x/pci/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am index e890b8c69b..6aa74a8bf0 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/pci.rel C_FILES = pci.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/powerpc/ppcn_60x/start/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am index d00014c239..09e34051d9 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/powerpc/ppcn_60x/startup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am index 4374d69bb2..81cf82f4c1 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am @@ -9,10 +9,10 @@ PGM = $(ARCH)/startup.rel C_FILES = bspstart.c bspclean.c sbrk.c setvec.c spurious.c genpvec.c swap.c \ main.c bootcard.c bsplibc.c bsppost.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = bsptrap.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/powerpc/ppcn_60x/timer/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am index 7ee76eb7cc..70a4aa569b 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/powerpc/ppcn_60x/tod/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am index 289ab82702..92d25f822f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/tod.rel C_FILES = tod.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/powerpc/ppcn_60x/universe/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am index 6cb7288f2d..398aaa8deb 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/universe.rel C_FILES = universe.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/powerpc/ppcn_60x/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am index 469177d1e1..d996a11978 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/vectors.rel S_FILES = vectors.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/powerpc/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index e66cf068a6..f722d0521b 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -12,7 +12,7 @@ BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \ # pieces to pick up out of libcpu/$(RTEMS_CPU) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ ../@exceptions@/$(ARCH)/rtems-cpu.rel LIB = $(ARCH)/libbsp.a -- cgit v1.2.3