2003-12-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* console/Makefile.am: Eliminate *.rel.
	Use $(top_srcdir)/../../shared instead of ../../../shared.
	* startup/Makefile.am: Cosmetics.
This commit is contained in:
Ralf Corsepius
2003-12-30 02:15:25 +00:00
parent 88272b701d
commit 1a819ee56d
3 changed files with 15 additions and 17 deletions

View File

@@ -1,3 +1,9 @@
2003-12-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* console/Makefile.am: Eliminate *.rel.
Use $(top_srcdir)/../../shared instead of ../../../shared.
* startup/Makefile.am: Cosmetics.
2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Eliminate VPATH.

View File

@@ -2,29 +2,23 @@
## $Id$
##
PGM = $(ARCH)/console.rel
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
C_FILES = console-io.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
shared_C_FILES = ../../../shared/console-polled.c
OBJS += $(shared_C_FILES:../../../shared/%.c=$(ARCH)/%.$(OBJEXT))
shared_C_FILES = $(top_srcdir)/../../shared/console-polled.c
OBJS += \
$(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
S_FILES = consupp.S
OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../../../shared/%.c $(ARCH)/$(dirstamp)
$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
$(PGM): $(OBJS)
$(make-rel)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
all-local: $(PGM)
noinst_DATA = $(OBJS)
EXTRA_DIST = $(C_FILES) $(S_FILES)

View File

@@ -2,8 +2,6 @@
## $Id$
##
PGM = $(ARCH)/startup.rel
C_FILES = bspclean.c bspstart.c setvec.c
@@ -18,12 +16,12 @@ shared_C_FILES += $(top_srcdir)/../../shared/bsppost.c
shared_C_FILES += $(top_srcdir)/../../shared/main.c
shared_C_FILES += $(top_srcdir)/../../shared/sbrk.c
shared_C_FILES += $(top_srcdir)/../../shared/gnatinstallhandler.c
OBJS += $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
OBJS += \
$(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
$(PGM): $(OBJS)
$(make-rel)