summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/mbx8xx
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-22 16:09:32 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-22 16:09:32 +0000
commit926ec3b2855673ca51e2891fec1bd537d84eded6 (patch)
tree3bc51c5f3d28b4da1cf8ac719fd72a6a894175e7 /c/src/lib/libbsp/powerpc/mbx8xx
parent2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-926ec3b2855673ca51e2891fec1bd537d84eded6.tar.bz2
2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Eliminate VPATH. * console/Makefile.am: Eliminate VPATH. * ide/Makefile.am: Eliminate VPATH. * irq/Makefile.am: Eliminate VPATH. * network/Makefile.am: Eliminate VPATH. * startup/Makefile.am: Eliminate VPATH.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mbx8xx')
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog9
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am14
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am19
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am30
7 files changed, 35 insertions, 52 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 6c7c839a25..fe7c24f605 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * clock/Makefile.am: Eliminate VPATH.
+ * console/Makefile.am: Eliminate VPATH.
+ * ide/Makefile.am: Eliminate VPATH.
+ * irq/Makefile.am: Eliminate VPATH.
+ * network/Makefile.am: Eliminate VPATH.
+ * startup/Makefile.am: Eliminate VPATH.
+
2003-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
PR 545/bsps
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am
index f20d3ae2c4..4c206b4872 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am
@@ -2,22 +2,14 @@
## $Id$
##
-VPATH = @srcdir@:@srcdir@/../../shared/clock
-
C_FILES = p_clock.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+# the .o files built here will be put into libbsp.a by ../wrapup/Makefile
-all-local: $(OBJS)
+noinst_DATA = $(OBJS)
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am
index 9f4fde7145..c03b8ffd2f 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am
@@ -21,7 +21,7 @@ $(PGM): $(OBJS)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-all-local: $(OBJS) $(PGM)
+all-local: $(PGM)
.PRECIOUS: $(PGM)
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am
index e0384c7ef7..3f356c76f6 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am
@@ -2,29 +2,14 @@
## Makefile.am,v 1.5 2002/08/11 06:59:03 ralf Exp
##
-PGM = # $(ARCH)/console.rel
-
C_FILES = idecfg.c pcmcia_ide.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
- $(make-rel)
-
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-all-local: $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = idecfg.c
+noinst_DATA = $(OBJS)
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
index e31a40b94b..39f5a5f7cf 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
@@ -14,16 +14,9 @@ OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+noinst_DATA = $(OBJS)
-$(PGM): $(OBJS)
- $(make-rel)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-
-all-local: $(PREINSTALL_FILES) $(OBJS) $(PGM)
+all-local: $(PREINSTALL_FILES)
EXTRA_DIST = irq.c irq_asm.S irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am
index 35260c6e8f..49375213e1 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am
@@ -24,7 +24,7 @@ $(PGM): $(OBJS)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
if HAS_NETWORKING
-all-local: $(OBJS) $(PGM)
+all-local: $(PGM)
endif
.PRECIOUS: $(PGM)
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am
index 5adcdd2b9b..bb839a7d83 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am
@@ -2,25 +2,29 @@
## $Id$
##
-VPATH = @srcdir@:@srcdir@/../../../shared
-
PGM = $(ARCH)/startup.rel
-C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c imbx8xx.c \
- main.c mmutlbtab.c sbrk.c gnatinstallhandler.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-S_FILES = start.s
-S_O_FILES = $(S_FILES:%.s=$(ARCH)/%.$(OBJEXT))
+C_FILES = bspstart.c imbx8xx.c mmutlbtab.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-OBJS = $(C_O_FILES) $(S_O_FILES)
+S_FILES = start.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+shared_C_FILES = $(top_srcdir)/../../shared/bootcard.c
+shared_C_FILES += $(top_srcdir)/../../shared/bspclean.c
+shared_C_FILES += $(top_srcdir)/../../shared/bsplibc.c
+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))
+
+$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
$(PGM): $(OBJS)
$(make-rel)
@@ -31,7 +35,7 @@ project_lib_DATA = linkcmds
all-local: $(PGM) $(TMPINSTALL_FILES)
-EXTRA_DIST = bspstart.c imbx8xx.c linkcmds mmutlbtab.c setvec.c
+EXTRA_DIST = linkcmds $(C_FILES)
$(PROJECT_LIB)/$(dirstamp):
@$(mkdir_p) $(PROJECT_LIB)