diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-17 10:53:28 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-17 10:53:28 +0000 |
| commit | 7b110d2005bf8527b08279d08254a09e02e31483 (patch) | |
| tree | d952ee726d4e09d4bc2ad5c166ea6f018497f1f5 /c/src/lib/libbsp/powerpc/eth_comm | |
| parent | 2002-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-7b110d2005bf8527b08279d08254a09e02e31483.tar.bz2 | |
2002-12-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* canbus/Makefile.am: Don't include @RTEMS_BSP@.cfg.
* clock/Makefile.am: Don't include @RTEMS_BSP@.cfg.
* console/Makefile.am: Don't include @RTEMS_BSP@.cfg.
* irq/Makefile.am: Don't include @RTEMS_BSP@.cfg.
Remove SORDID_HACK. Eliminate *_O_FILES.
* network/Makefile.am: Don't include @RTEMS_BSP@.cfg.
* start/Makefile.am: Don't include @RTEMS_BSP@.cfg.
* startup/Makefile.am: Don't include @RTEMS_BSP@.cfg.
* vectors/Makefile.am: Don't include @RTEMS_BSP@.cfg.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/eth_comm')
9 files changed, 15 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index 875e1c8693..71e116b067 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,15 @@ +2002-12-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * canbus/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * clock/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * console/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * irq/Makefile.am: Don't include @RTEMS_BSP@.cfg. + Remove SORDID_HACK. Eliminate *_O_FILES. + * network/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * start/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * startup/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * vectors/Makefile.am: Don't include @RTEMS_BSP@.cfg. + 2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * start/Makefile.am: Use install-data-local to install startfile. diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am index 2d3588dda5..a15da8cbdb 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am @@ -10,7 +10,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am index cce6de00a4..c4b3986840 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am @@ -10,7 +10,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am index cdf040e038..90a05c095b 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am @@ -10,7 +10,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am index 1e7076c84b..02369bb88c 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am @@ -6,23 +6,16 @@ include_bspdir = $(includedir)/bsp C_FILES = irq.c irq_init.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_bsp_HEADERS = irq.h S_FILES = irq_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) -OBJS = $(C_O_FILES) $(S_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -## FIXME: WTF is this? -SORDID_HACK: - rm -f $(PROJECT_INCLUDE)/bsp/irq.h - $(PROJECT_INCLUDE)/bsp: $(mkinstalldirs) $@ @@ -41,7 +34,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: SORDID_HACK $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(PGM) +all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = irq.c irq_asm.S irq_init.c diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am index 567c68904f..74a99dce17 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am @@ -10,7 +10,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am index 390b1f64ca..ab006bacdd 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am @@ -7,7 +7,6 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am index 25b2823bc9..a24ee598af 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am @@ -13,7 +13,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am index 51662c9a8e..04de181a97 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am @@ -14,7 +14,6 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am |