From c0d13d058cd223fb4a03593a34c813297e838358 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:21:44 +0000 Subject: 2002-08-11 Ralf Corsepius * console/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/a29k/portsw/ChangeLog | 7 +++++++ c/src/lib/libbsp/a29k/portsw/console/Makefile.am | 2 +- c/src/lib/libbsp/a29k/portsw/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/a29k/portsw/startup/Makefile.am | 2 +- c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) (limited to 'c/src/lib/libbsp/a29k/portsw') diff --git a/c/src/lib/libbsp/a29k/portsw/ChangeLog b/c/src/lib/libbsp/a29k/portsw/ChangeLog index 01c7095ec8..af3be0c160 100644 --- a/c/src/lib/libbsp/a29k/portsw/ChangeLog +++ b/c/src/lib/libbsp/a29k/portsw/ChangeLog @@ -1,3 +1,10 @@ +2002-08-11 Ralf Corsepius + + * console/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 * startup/Makefile.am: Reformat. diff --git a/c/src/lib/libbsp/a29k/portsw/console/Makefile.am b/c/src/lib/libbsp/a29k/portsw/console/Makefile.am index 3ffbfec7e3..9093a24052 100644 --- a/c/src/lib/libbsp/a29k/portsw/console/Makefile.am +++ b/c/src/lib/libbsp/a29k/portsw/console/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/console.rel C_FILES = console.c serial.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_HEADERS = concntl.h noinst_HEADERS = serial.h diff --git a/c/src/lib/libbsp/a29k/portsw/start/Makefile.am b/c/src/lib/libbsp/a29k/portsw/start/Makefile.am index 16a290ba7d..092a793c78 100644 --- a/c/src/lib/libbsp/a29k/portsw/start/Makefile.am +++ b/c/src/lib/libbsp/a29k/portsw/start/Makefile.am @@ -3,7 +3,7 @@ ## S_FILES = start.S register.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 = amd.ah start.S pswmacro.ah register.S register.ah diff --git a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.am b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.am index 88564aea1e..dfc4ade3d9 100644 --- a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.am +++ b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.am @@ -8,7 +8,7 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.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/a29k/portsw/wrapup/Makefile.am b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am index 2ee6c71440..3c4c345881 100644 --- a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am +++ b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am @@ -6,7 +6,7 @@ BSP_FILES = startup console iic ethernet flash nvram 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