From 7a5a3a413008919f019200b50577b4df1b1fd194 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 5 Jan 2004 07:17:01 +0000 Subject: 2004-01-05 Ralf Corsepius * start/Makefile.am: Remove. * Makefile.am: Merge-in start/Makefile.am. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/sh/gensh1/ChangeLog | 6 ++++++ c/src/lib/libbsp/sh/gensh1/Makefile.am | 25 +++++++++++++++++----- c/src/lib/libbsp/sh/gensh1/configure.ac | 1 - c/src/lib/libbsp/sh/gensh1/start/Makefile.am | 32 ---------------------------- c/src/lib/libbsp/sh/gensh2/ChangeLog | 6 ++++++ c/src/lib/libbsp/sh/gensh2/Makefile.am | 21 ++++++++++++++---- c/src/lib/libbsp/sh/gensh2/configure.ac | 1 - c/src/lib/libbsp/sh/gensh2/start/Makefile.am | 32 ---------------------------- c/src/lib/libbsp/sh/gensh4/ChangeLog | 6 ++++++ c/src/lib/libbsp/sh/gensh4/Makefile.am | 21 ++++++++++++++---- c/src/lib/libbsp/sh/gensh4/configure.ac | 1 - c/src/lib/libbsp/sh/gensh4/start/Makefile.am | 32 ---------------------------- c/src/lib/libbsp/sh/shsim/ChangeLog | 6 ++++++ c/src/lib/libbsp/sh/shsim/Makefile.am | 23 ++++++++++++++++---- c/src/lib/libbsp/sh/shsim/configure.ac | 1 - c/src/lib/libbsp/sh/shsim/start/Makefile.am | 32 ---------------------------- c/src/lib/libbsp/sh/simsh4/ChangeLog | 6 ++++++ c/src/lib/libbsp/sh/simsh4/Makefile.am | 17 +++++++++++---- c/src/lib/libbsp/sh/simsh4/configure.ac | 1 - c/src/lib/libbsp/sh/simsh4/start/Makefile.am | 32 ---------------------------- 20 files changed, 116 insertions(+), 186 deletions(-) delete mode 100644 c/src/lib/libbsp/sh/gensh1/start/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/gensh2/start/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/gensh4/start/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/shsim/start/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/simsh4/start/Makefile.am (limited to 'c/src') diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index a7ac964ef9..1bb77ce330 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,9 @@ +2004-01-05 Ralf Corsepius + + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + 2004-01-05 Ralf Corsepius * wrapup/Makefile.am: Eliminate $(LIB). diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 1f7a6f0d18..b56bdde9bc 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -4,21 +4,36 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . start startup scitab console wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup scitab console wrapup include_HEADERS += include/coverhd.h -all-local: $(PREINSTALL_FILES) +S_FILES = start/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -EXTRA_DIST = times +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +EXTRA_DIST = $(S_FILES) + +EXTRA_DIST += times + +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac index c941b89004..6bf5c3e254 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.ac +++ b/c/src/lib/libbsp/sh/gensh1/configure.ac @@ -25,7 +25,6 @@ AC_SUBST(CPU_CLOCK_RATE_HZ) AC_CONFIG_FILES([Makefile console/Makefile scitab/Makefile -start/Makefile startup/Makefile wrapup/Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/sh/gensh1/start/Makefile.am b/c/src/lib/libbsp/sh/gensh1/start/Makefile.am deleted file mode 100644 index 01a0f84051..0000000000 --- a/c/src/lib/libbsp/sh/gensh1/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 1a0bad0d9a..2bd18e270c 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,9 @@ +2004-01-05 Ralf Corsepius + + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + 2004-01-05 Ralf Corsepius * wrapup/Makefile.am: Eliminate $(LIB). diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 1d836ece28..ea0cac7796 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -4,19 +4,32 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + ## wrapup is the one that actually builds and installs the library ## from the individual .rel files built in other directories -SUBDIRS = . start startup scitab console wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup scitab console wrapup include_HEADERS += include/coverhd.h -all-local: $(PREINSTALL_FILES) +S_FILES = start/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac index 409beedd12..ff5c90ef71 100644 --- a/c/src/lib/libbsp/sh/gensh2/configure.ac +++ b/c/src/lib/libbsp/sh/gensh2/configure.ac @@ -34,7 +34,6 @@ RTEMS_BSPOPTS_HELP([STANDALONE_EVB], AC_CONFIG_FILES([Makefile console/Makefile scitab/Makefile -start/Makefile startup/Makefile wrapup/Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/sh/gensh2/start/Makefile.am b/c/src/lib/libbsp/sh/gensh2/start/Makefile.am deleted file mode 100644 index af9ff13e7d..0000000000 --- a/c/src/lib/libbsp/sh/gensh2/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S start.ram start.rom - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index f7171b6bbe..ab67483c85 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,9 @@ +2004-01-05 Ralf Corsepius + + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + 2004-01-05 Ralf Corsepius * wrapup/Makefile.am: Eliminate $(LIB). diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 7d3b56a43a..5e5f244ac3 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -4,19 +4,28 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + ## wrapup is the one that actually builds and installs the library ## from the individual .rel files built in other directories -SUBDIRS = . start startup console hw_init wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup console hw_init wrapup include_HEADERS += include/sdram.h include_HEADERS += include/coverhd.h -all-local: $(PREINSTALL_FILES) +S_FILES = start/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times +TMPINSTALL_FILES = + $(PROJECT_INCLUDE)/sdram.h: include/sdram.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sdram.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sdram.h @@ -25,5 +34,9 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac index cb98b8fcf7..6a99956878 100644 --- a/c/src/lib/libbsp/sh/gensh4/configure.ac +++ b/c/src/lib/libbsp/sh/gensh4/configure.ac @@ -33,7 +33,6 @@ AC_DEFINE_UNQUOTED( # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -start/Makefile startup/Makefile hw_init/Makefile console/Makefile diff --git a/c/src/lib/libbsp/sh/gensh4/start/Makefile.am b/c/src/lib/libbsp/sh/gensh4/start/Makefile.am deleted file mode 100644 index 01a0f84051..0000000000 --- a/c/src/lib/libbsp/sh/gensh4/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index dedf76bb75..cd6954420b 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,9 @@ +2004-01-05 Ralf Corsepius + + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + 2004-01-05 Ralf Corsepius * start/regs.S: Remove. diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index aceea0a932..e1dbf1e3b6 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -4,16 +4,27 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . start startup clock scitab gdbsci console wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup clock scitab gdbsci console wrapup include_HEADERS += include/gdbsci.h nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h -all-local: $(PREINSTALL_FILES) +S_FILES = start/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +EXTRA_DIST = $(S_FILES) + +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/gdbsci.h: include/gdbsci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gdbsci.h @@ -23,5 +34,9 @@ $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac index 3f97f8d2c1..b9cf555557 100644 --- a/c/src/lib/libbsp/sh/shsim/configure.ac +++ b/c/src/lib/libbsp/sh/shsim/configure.ac @@ -69,7 +69,6 @@ clock/Makefile console/Makefile scitab/Makefile gdbsci/Makefile -start/Makefile startup/Makefile wrapup/Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/sh/shsim/start/Makefile.am b/c/src/lib/libbsp/sh/shsim/start/Makefile.am deleted file mode 100644 index 01a0f84051..0000000000 --- a/c/src/lib/libbsp/sh/shsim/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog index 14208d5573..90d0f6a9ae 100644 --- a/c/src/lib/libbsp/sh/simsh4/ChangeLog +++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog @@ -1,3 +1,9 @@ +2004-01-05 Ralf Corsepius + + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + 2004-01-05 Ralf Corsepius * wrapup/Makefile.am: Eliminate $(LIB). diff --git a/c/src/lib/libbsp/sh/simsh4/Makefile.am b/c/src/lib/libbsp/sh/simsh4/Makefile.am index 21c42f9537..6a110c8156 100644 --- a/c/src/lib/libbsp/sh/simsh4/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/Makefile.am @@ -4,21 +4,30 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + ## wrapup is the one that actually builds and installs the library ## from the individual .rel files built in other directories -SUBDIRS = . start startup console clock timer wrapup +SUBDIRS = . startup console clock timer wrapup SUBDIRS += tools # FIXME: This directory is missing # ramdisk -include $(top_srcdir)/../../bsp.am - include_HEADERS += include/syscall.h include_HEADERS += include/ramdisk.h include_HEADERS += include/coverhd.h -all-local: $(PREINSTALL_FILES) +S_FILES = start/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +EXTRA_DIST = $(S_FILES) $(PROJECT_INCLUDE)/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syscall.h diff --git a/c/src/lib/libbsp/sh/simsh4/configure.ac b/c/src/lib/libbsp/sh/simsh4/configure.ac index 8015c39b0b..f1b650724b 100644 --- a/c/src/lib/libbsp/sh/simsh4/configure.ac +++ b/c/src/lib/libbsp/sh/simsh4/configure.ac @@ -36,7 +36,6 @@ AC_DEFINE_UNQUOTED( # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile console/Makefile -start/Makefile startup/Makefile clock/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/sh/simsh4/start/Makefile.am b/c/src/lib/libbsp/sh/simsh4/start/Makefile.am deleted file mode 100644 index 9c439ee6db..0000000000 --- a/c/src/lib/libbsp/sh/simsh4/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S trap.S - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3