diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-03 04:33:07 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-03 04:33:07 +0000 |
commit | db3fa142bb1d4dad52d5b8157c8d238b28d344ee (patch) | |
tree | fcd212f37bf66dceb56bbe96eef97e14c975f059 /c/src/lib/libbsp/sh/gensh1 | |
parent | 2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-db3fa142bb1d4dad52d5b8157c8d238b28d344ee.tar.bz2 |
2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am: Remove build-variant support.
Diffstat (limited to 'c/src/lib/libbsp/sh/gensh1')
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/Makefile.am | 77 |
2 files changed, 24 insertions, 57 deletions
diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index 4625065084..aecab048ac 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> + + * Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius <ralf_corsepius@rtems.org> * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 9c75305c8c..0657abb4fb 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -11,24 +11,23 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h + nodist_include_HEADERS = include/bspopts.h +DISTCLEANFILES = include/bspopts.h -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = include_HEADERS += include/coverhd.h EXTRA_DIST = start/start.S -start$(LIB_VARIANT).$(OBJEXT): start/start.S +start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -DASM -o $@ -c $< -project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspstart.c startup/bspclean.c ../../shared/sbrk.c \ ../../shared/bootcard.c ../../shared/main.c \ @@ -36,14 +35,6 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += startup_g.rel -CLEANFILES += startup_g.rel -startup_g_rel_SOURCES = $(startup_rel_SOURCES) -startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += startup$(LIB_VARIANT).rel - SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen scitab.c: $(SHGEN) @@ -51,52 +42,24 @@ scitab.c: $(SHGEN) BUILT_SOURCES = scitab.c CLEANFILES += scitab.c -EXTRA_PROGRAMS += scitab.rel -CLEANFILES += scitab.rel +noinst_PROGRAMS += scitab.rel scitab_rel_SOURCES = scitab.c scitab_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) scitab_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += scitab_g.rel -CLEANFILES += scitab_g.rel -scitab_g_rel_SOURCES = $(scitab_rel_SOURCES) -scitab_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -scitab_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += scitab$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = ../../sh/shared/console.c console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += console_g.rel -CLEANFILES += console_g.rel -console_g_rel_SOURCES = $(console_rel_SOURCES) -console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += console$(LIB_VARIANT).rel - -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel scitab$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/delay$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score$(LIB_VARIANT).rel - -EXTRA_LIBRARIES += libbsp_g.a -CLEANFILES += libbsp_g.a -libbsp_g_a_SOURCES = $(libbsp_a_SOURCES) -libbsp_g_a_LIBADD = $(libbsp_a_LIBADD) - -noinst_DATA += libbsp$(LIB_VARIANT).a +libbsp_a_LIBADD = startup.rel scitab.rel console.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/delay.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -136,16 +99,16 @@ $(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): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am |