diff options
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi332/ChangeLog | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi332/clock/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi332/console/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi332/start/Makefile.am | 19 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi332/startup/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi332/timer/Makefile.am | 1 |
7 files changed, 19 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog index 20d010afd3..a107bd74c9 100644 --- a/c/src/lib/libbsp/m68k/efi332/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi332/ChangeLog @@ -1,3 +1,13 @@ +2002-12-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * clock/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * console/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * spurious/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * start/Makefile.am: Don't include @RTEMS_BSP@.cfg. + Various fixes to get it compiling again. + * startup/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * timer/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/m68k/efi332/clock/Makefile.am b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am index efd98a00a4..43dbc6aadc 100644 --- a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/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/m68k/efi332/console/Makefile.am b/c/src/lib/libbsp/m68k/efi332/console/Makefile.am index cdf040e038..90a05c095b 100644 --- a/c/src/lib/libbsp/m68k/efi332/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/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/m68k/efi332/spurious/Makefile.am b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am index 2f77a0e10d..fc21727869 100644 --- a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/spurious/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/m68k/efi332/start/Makefile.am b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am index 44afa19b76..1ca13b349a 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am @@ -3,11 +3,10 @@ ## C_FILES = start.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +S_FILES = except_vect_332_ROM.S +OBJS += $(S_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 @@ -30,16 +29,16 @@ $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT): \ $(ARCH)/except_vect_332_ROM.$(OBJEXT) $(INSTALL_DATA) $< $@ -$(PROJECT_RELEASE)/lib/ram_init$(LIB_VARIANT): \ - $(ARCH)/ram_init +$(PROJECT_RELEASE)/lib/ram_init$(LIB_VARIANT): $(ARCH)/ram_init + $(INSTALL_DATA) $< $@ + +$(PROJECT_RELEASE)/lib/ram_init_FW$(LIB_VARIANT): $(ARCH)/ram_init_FW $(INSTALL_DATA) $< $@ -$(PROJECT_RELEASE)/lib/ram_init_FW$(LIB_VARIANT): \ - $(ARCH)/ram_init_FW +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) $(INSTALL_DATA) $< $@ -$(ARCH)/ram_init: $(srcdir)/start.c $(srcdir)/ram_init.ld \ - $(srcdir)/ram_init.sed +$(ARCH)/ram_init: $(srcdir)/start.c $(srcdir)/ram_init.ld $(srcdir)/ram_init.sed sed -f $(srcdir)/ram_init.sed $(srcdir)/start.c >$(ARCH)/ram_init.S $(CC) -D SIM_CRB=0x0000 -E $(ARCH)/ram_init.S >$(ARCH)/ram_init1.S sed "/.$(OBJEXT)rg/ {N; s/\n/%/; P;}; /\.text/P; D;" $(ARCH)/ram_init1.S | \ diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am index bb572dcf8c..594ca349f5 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am @@ -16,7 +16,6 @@ S_O_FILES = $(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 diff --git a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am index 70a4aa569b..0e51a50a0a 100644 --- a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/timer/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 |