diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-05 07:17:01 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-05 07:17:01 +0000 |
commit | 7a5a3a413008919f019200b50577b4df1b1fd194 (patch) | |
tree | 0b46fe503010e02b77b0c2880666f736e2b82688 /c/src/lib/libbsp/sh/gensh1 | |
parent | 2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-7a5a3a413008919f019200b50577b4df1b1fd194.tar.bz2 |
2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Remove.
* Makefile.am: Merge-in start/Makefile.am.
* configure.ac: Reflect changes above.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/Makefile.am | 25 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/start/Makefile.am | 32 |
4 files changed, 26 insertions, 38 deletions
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,5 +1,11 @@ 2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + +2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * wrapup/Makefile.am: Eliminate $(LIB). Use noinst_DATA to trigger building libbsp.a. 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 |