2002-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* 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.
This commit is contained in:
Ralf Corsepius
2002-08-11 06:45:06 +00:00
parent d442521020
commit 2568abf32c
11 changed files with 31 additions and 18 deletions

View File

@@ -1,3 +1,16 @@
2002-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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 <joel@OARcorp.com> 2002-08-05 Joel Sherrill <joel@OARcorp.com>
* Per PR260 eliminate use of make-target-options. This impacted * Per PR260 eliminate use of make-target-options. This impacted

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/clock.rel PGM = $(ARCH)/clock.rel
C_FILES = ckinit.c C_FILES = ckinit.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/console.rel PGM = $(ARCH)/console.rel
C_FILES = console.c C_FILES = console.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/consolex.rel PGM = $(ARCH)/consolex.rel
C_FILES = consolex.c C_FILES = consolex.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_HEADERS = consolex.h include_HEADERS = consolex.h

View File

@@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../mvme167/network
PGM = $(ARCH)/network.rel PGM = $(ARCH)/network.rel
C_FILES = network.c C_FILES = network.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)

View File

@@ -5,7 +5,7 @@
VPATH = @srcdir@:@srcdir@/../../shared VPATH = @srcdir@:@srcdir@/../../shared
S_FILES = start.S S_FILES = start.S
S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
OBJS = $(S_O_FILES) OBJS = $(S_O_FILES)
@@ -17,15 +17,15 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using += # (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) $< $@ $(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 include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -10,7 +10,7 @@ PGM = $(ARCH)/startup.rel
C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c \ C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c \
m68kpretaskinghook.c main.c page_table.c sbrk.c setvec.c \ m68kpretaskinghook.c main.c page_table.c sbrk.c setvec.c \
gnatinstallhandler.c gnatinstallhandler.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)

View File

@@ -6,10 +6,10 @@
PGM = $(ARCH)/timer.rel PGM = $(ARCH)/timer.rel
C_FILES = timer.c 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_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) OBJS = $(C_O_FILES) $(S_O_FILES)

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/tod.rel PGM = $(ARCH)/tod.rel
C_FILES = tod.c C_FILES = tod.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)

View File

@@ -11,7 +11,7 @@ noinst_PROGRAMS = sload
## HACK: install to build-tree ## HACK: install to build-tree
install-exec-local: $(PROGRAMS) install-exec-local: $(PROGRAMS)
$(mkinstalldirs) $(PROJECT_ROOT)/mvme162/bin $(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/bin
$(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/mvme162/bin $(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/@RTEMS_BSP@/bin
endif endif
include $(top_srcdir)/../../../../../../../automake/host.am include $(top_srcdir)/../../../../../../../automake/host.am

View File

@@ -10,9 +10,9 @@ endif
BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER) BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER)
# bummer; have to use $foreach since % pattern subst rules only replace 1x # 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 ../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) $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
LIB = $(ARCH)/libbsp.a LIB = $(ARCH)/libbsp.a