From a9285f5b0df4e2923f288afce96baed2f81f06af Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 29 Jan 2004 10:35:45 +0000 Subject: 2004-01-29 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, gdbsci/Makefile.am, startup/Makefile.am, wrapup/Makefile.am, console/Makefile.am, scitab/Makefile.am, trap34/Makefile.am. Use automake compilation rules. * clock/Makefile.am, gdbsci/Makefile.am, startup/Makefile.am, wrapup/Makefile.am, console/Makefile.am, scitab/Makefile.am, trap34/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/sh/shsim/ChangeLog | 10 ++ c/src/lib/libbsp/sh/shsim/Makefile.am | 140 +++++++++++++++++++++++--- c/src/lib/libbsp/sh/shsim/clock/Makefile.am | 28 ------ c/src/lib/libbsp/sh/shsim/configure.ac | 8 +- c/src/lib/libbsp/sh/shsim/console/Makefile.am | 31 ------ c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am | 26 ----- c/src/lib/libbsp/sh/shsim/scitab/Makefile.am | 33 ------ c/src/lib/libbsp/sh/shsim/startup/Makefile.am | 46 --------- c/src/lib/libbsp/sh/shsim/trap34/Makefile.am | 35 ------- c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am | 19 ---- 10 files changed, 139 insertions(+), 237 deletions(-) delete mode 100644 c/src/lib/libbsp/sh/shsim/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/shsim/console/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/shsim/scitab/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/shsim/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/shsim/trap34/Makefile.am delete mode 100644 c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index 9695cbe06f..65236ff032 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,13 @@ +2004-01-29 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, gdbsci/Makefile.am, + startup/Makefile.am, wrapup/Makefile.am, console/Makefile.am, + scitab/Makefile.am, trap34/Makefile.am. Use automake compilation rules. + * clock/Makefile.am, gdbsci/Makefile.am, startup/Makefile.am, + wrapup/Makefile.am, console/Makefile.am, scitab/Makefile.am, + trap34/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-28 Ralf Corsepius * configure.ac: Add nostdinc to AUTOMAKE_OPTIONS. diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 5843ee6e23..017329f49a 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -7,22 +7,134 @@ 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 = . startup clock scitab gdbsci console wrapup +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = include_HEADERS += include/gdbsci.h -nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h +nodist_include_HEADERS += ../../shared/include/coverhd.h -S_FILES = start/start.S -$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) +EXTRA_DIST = start/start.S +start$(LIB_VARIANT).$(OBJEXT): start/start.S ${CCASCOMPILE} -DASM -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) +dist_project_lib_DATA += startup/linkcmds -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +EXTRA_PROGRAMS += startup.rel +CLEANFILES += startup.rel +startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ + startup/bspstart.c ../../shared/bspclean.c ../../shared/sbrk.c \ + ../../shared/bootcard.c ../../shared/main.c \ + ../../shared/gnatinstallhandler.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 + +EXTRA_PROGRAMS += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = clock/clockdrv.c +clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += clock_g.rel +CLEANFILES += clock_g.rel +clock_g_rel_SOURCES = $(clock_rel_SOURCES) +clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += clock$(LIB_VARIANT).rel + +scitab.c: $(SHGEN) + $(SHGEN) -H @CPU_CLOCK_RATE_HZ@ sci > $@ +BUILT_SOURCES = scitab.c +CLEANFILES += scitab.c + +EXTRA_PROGRAMS += scitab.rel +CLEANFILES += 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 += gdbsci.rel +CLEANFILES += gdbsci.rel +gdbsci_rel_SOURCES = gdbsci/gdbsci.c +gdbsci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +gdbsci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += gdbsci_g.rel +CLEANFILES += gdbsci_g.rel +gdbsci_g_rel_SOURCES = $(gdbsci_rel_SOURCES) +gdbsci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +gdbsci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += gdbsci$(LIB_VARIANT).rel -EXTRA_DIST = $(S_FILES) +# +# FIXME: trap34 is unused +# +EXTRA_PROGRAMS += trap34.rel +CLEANFILES += trap34.rel +trap34_rel_SOURCES = trap34/console-io.c trap34/console-support.S +trap34_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +trap34_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += trap34_g.rel +CLEANFILES += trap34_g.rel +trap34_g_rel_SOURCES = $(trap34_rel_SOURCES) +trap34_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +trap34_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += trap34$(LIB_VARIANT).rel + +EXTRA_PROGRAMS += console.rel +CLEANFILES += console.rel +console_rel_SOURCES = ../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 +libbsp_a_SOURCES = +libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ + console$(LIB_VARIANT).rel gdbsci$(LIB_VARIANT).rel \ + scitab$(LIB_VARIANT).rel +libbsp_a_LIBADD += \ + ../../../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 + +noinst_DATA += console$(LIB_VARIANT).rel + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = TMPINSTALL_FILES = @@ -31,15 +143,19 @@ $(PROJECT_INCLUDE)/gdbsci.h: include/gdbsci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gdbsci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/gdbsci.h -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/coverhd.h: ../../shared/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) +$(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) -CLEANFILES = $(PREINSTALL_FILES) +$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds + +CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/sh/shsim/clock/Makefile.am b/c/src/lib/libbsp/sh/shsim/clock/Makefile.am deleted file mode 100644 index ec3f9f6d22..0000000000 --- a/c/src/lib/libbsp/sh/shsim/clock/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/clock.rel - -C_FILES = clockdrv.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -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 fd6ac01b08..37ebf39b73 100644 --- a/c/src/lib/libbsp/sh/shsim/configure.ac +++ b/c/src/lib/libbsp/sh/shsim/configure.ac @@ -65,11 +65,5 @@ RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ], AC_SUBST(CPU_CLOCK_RATE_HZ) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -scitab/Makefile -gdbsci/Makefile -startup/Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/sh/shsim/console/Makefile.am b/c/src/lib/libbsp/sh/shsim/console/Makefile.am deleted file mode 100644 index b6258c9ce8..0000000000 --- a/c/src/lib/libbsp/sh/shsim/console/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../shared - -PGM = $(ARCH)/console.rel - -C_FILES = console.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by -# ../wrapup/Makefile - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am b/c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am deleted file mode 100644 index 0ffa632139..0000000000 --- a/c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/sci.rel - -C_FILES = gdbsci.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/scitab/Makefile.am b/c/src/lib/libbsp/sh/shsim/scitab/Makefile.am deleted file mode 100644 index c42125de77..0000000000 --- a/c/src/lib/libbsp/sh/shsim/scitab/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/scitab.rel - -C_FILES = scitab.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen - -# -# (OPTIONAL) Add local stuff here using += -# - -CLEANFILES = scitab.c - -$(PGM): $(OBJS) - $(make-rel) - -scitab.c: $(SHGEN) - $(SHGEN) -H @CPU_CLOCK_RATE_HZ@ sci > $@ - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/startup/Makefile.am b/c/src/lib/libbsp/sh/shsim/startup/Makefile.am deleted file mode 100644 index 9a72f5e1d4..0000000000 --- a/c/src/lib/libbsp/sh/shsim/startup/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared - -PGM = $(ARCH)/startup.rel - -C_FILES = bsplibc.c bsppost.c bspstart.c bspclean.c sbrk.c bootcard.c main.c \ - gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -project_lib_DATA = linkcmds - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = bspstart.c linkcmds - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/trap34/Makefile.am b/c/src/lib/libbsp/sh/shsim/trap34/Makefile.am deleted file mode 100644 index c197c7ca74..0000000000 --- a/c/src/lib/libbsp/sh/shsim/trap34/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared - -PGM = $(ARCH)/console.rel - -C_FILES = console-io.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -S_FILES = console-support.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = console.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am b/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am deleted file mode 100644 index 7ddb92d399..0000000000 --- a/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - -BSP_FILES = startup clock console gdbsci scitab - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score$(LIB_VARIANT).rel - -$(ARCH)/libbsp.a: ${OBJS} - $(make-library) - -noinst_DATA = $(ARCH)/libbsp.a - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3