From 2568abf32c62d45010190e764afe174d18391e52 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:45:06 +0000 Subject: 2002-08-11 Ralf Corsepius * clock/Makefile.am: Use .$(OBJEXT) instead of .o. * console/Makefile.am: Use .$(OBJEXT) instead of .o. * consolex/Makefile.am: Use .$(OBJEXT) instead of .o. * network/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. * tools/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. --- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 13 +++++++++++++ c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme162/console/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme162/network/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme162/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am | 4 ++-- 11 files changed, 31 insertions(+), 18 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index ac827f57a3..300b0fbfe6 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,16 @@ +2002-08-11 Ralf Corsepius + + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * consolex/Makefile.am: Use .$(OBJEXT) instead of .o. + * network/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. + * tools/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/mvme162/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am index 9971dae61c..efd98a00a4 100644 --- a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/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/mvme162/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am index cb88cbdb35..cdf040e038 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/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/mvme162/consolex/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am index 15e24b5b80..c3f492f05c 100644 --- a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/consolex.rel C_FILES = consolex.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_HEADERS = consolex.h diff --git a/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am index d7a58af35f..2dc9e50c00 100644 --- a/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am @@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../mvme167/network PGM = $(ARCH)/network.rel C_FILES = network.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/mvme162/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am index 76356666e9..fd2d262ebf 100644 --- a/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am @@ -5,7 +5,7 @@ VPATH = @srcdir@:@srcdir@/../../shared S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) @@ -17,15 +17,15 @@ 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) include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am index e25f53ed5a..728541f941 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am @@ -10,7 +10,7 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c \ m68kpretaskinghook.c main.c page_table.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/mvme162/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am index fff8afcc91..8b12aeed08 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am @@ -6,10 +6,10 @@ PGM = $(ARCH)/timer.rel C_FILES = timer.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = timerisr.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/m68k/mvme162/tod/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am index e24510a30f..72f324f890 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/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/m68k/mvme162/tools/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am index e80017352a..38e8f9ca77 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am @@ -11,7 +11,7 @@ noinst_PROGRAMS = sload ## HACK: install to build-tree install-exec-local: $(PROGRAMS) - $(mkinstalldirs) $(PROJECT_ROOT)/mvme162/bin - $(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/mvme162/bin + $(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/bin + $(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/@RTEMS_BSP@/bin endif include $(top_srcdir)/../../../../../../../automake/host.am diff --git a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am index cd94bdd8f7..bccdbbe2cc 100644 --- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am @@ -10,9 +10,9 @@ endif BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER) # 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))) \ $(wildcard ../consolex/$(ARCH)/consolex.rel) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.$(OBJEXT)) \ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3