From 36e20a0a862ceddc8ce085fc06117bbe5f497d1e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 2 Feb 2004 10:25:01 +0000 Subject: 2004-02-02 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/i960/i960sim/ChangeLog | 9 ++ c/src/lib/libbsp/i960/i960sim/Makefile.am | 112 ++++++++++++++++++++-- c/src/lib/libbsp/i960/i960sim/clock/.cvsignore | 2 - c/src/lib/libbsp/i960/i960sim/clock/Makefile.am | 30 ------ c/src/lib/libbsp/i960/i960sim/configure.ac | 8 +- c/src/lib/libbsp/i960/i960sim/console/.cvsignore | 2 - c/src/lib/libbsp/i960/i960sim/console/Makefile.am | 35 ------- c/src/lib/libbsp/i960/i960sim/start/.cvsignore | 2 - c/src/lib/libbsp/i960/i960sim/start/Makefile.am | 37 ------- c/src/lib/libbsp/i960/i960sim/startup/.cvsignore | 2 - c/src/lib/libbsp/i960/i960sim/startup/Makefile.am | 46 --------- c/src/lib/libbsp/i960/i960sim/timer/.cvsignore | 2 - c/src/lib/libbsp/i960/i960sim/timer/Makefile.am | 32 ------- c/src/lib/libbsp/i960/i960sim/wrapup/.cvsignore | 2 - c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am | 19 ---- 15 files changed, 112 insertions(+), 228 deletions(-) delete mode 100644 c/src/lib/libbsp/i960/i960sim/clock/.cvsignore delete mode 100644 c/src/lib/libbsp/i960/i960sim/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/i960sim/console/.cvsignore delete mode 100644 c/src/lib/libbsp/i960/i960sim/console/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/i960sim/start/.cvsignore delete mode 100644 c/src/lib/libbsp/i960/i960sim/start/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/i960sim/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/i960/i960sim/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/i960sim/timer/.cvsignore delete mode 100644 c/src/lib/libbsp/i960/i960sim/timer/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/i960sim/wrapup/.cvsignore delete mode 100644 c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog index 9d6011449f..4662c582b4 100644 --- a/c/src/lib/libbsp/i960/i960sim/ChangeLog +++ b/c/src/lib/libbsp/i960/i960sim/ChangeLog @@ -1,3 +1,12 @@ +2004-02-02 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + start/Makefile.am, startup/Makefile.am, timer/Makefile.am, + wrapup/Makefile.am. Use automake compilation rules. + * clock/Makefile.am, console/Makefile.am, start/Makefile.am, + startup/Makefile.am, timer/Makefile.am, wrapup/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/i960/i960sim/Makefile.am b/c/src/lib/libbsp/i960/i960sim/Makefile.am index 01dd56dfcd..b98b16b3cd 100644 --- a/c/src/lib/libbsp/i960/i960sim/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/Makefile.am @@ -4,26 +4,118 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . start startup clock console timer wrapup - +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + +nodist_include_HEADERS += ../../shared/include/coverhd.h + +EXTRA_DIST = start/start.c +start$(LIB_VARIANT).$(OBJEXT): start/start.c + ${COMPILE} -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) + +dist_project_lib_DATA += startup/linkcmds + +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 + +EXTRA_PROGRAMS += console.rel +CLEANFILES += console.rel +console_rel_SOURCES = console-io.c ../../shared/console-polled.c \ + mon-syscalls.S +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_PROGRAMS += startup.rel +CLEANFILES += startup.rel +startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ + ../../shared/main.c ../../shared/sbrk.c \ + ../../shared/gnatinstallhandler.c +startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -all-local: $(PREINSTALL_FILES) +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) -EXTRA_DIST = times +noinst_DATA += startup$(LIB_VARIANT).rel + +EXTRA_PROGRAMS += timer.rel +CLEANFILES += timer.rel +timer_rel_SOURCES = ../../shared/timerstub.c +timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += timer_g.rel +CLEANFILES += timer_g.rel +timer_g_rel_SOURCES = $(timer_rel_SOURCES) +timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += timer$(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 timer$(LIB_VARIANT).rel +libbsp_a_LIBADD += \ + ../../../libcpu/@RTEMS_CPU@/i960ka/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 + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +EXTRA_DIST += times PREINSTALL_DIRS = +TMPINSTALL_FILES = -$(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 -CLEANFILES = $(PREINSTALL_FILES) +$(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)/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) -include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/i960sim/clock/.cvsignore b/c/src/lib/libbsp/i960/i960sim/clock/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/clock/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am b/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am deleted file mode 100644 index b0ab135108..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am +++ /dev/null @@ -1,30 +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) - -EXTRA_DIST = ckinit.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/i960sim/configure.ac b/c/src/lib/libbsp/i960/i960sim/configure.ac index f77a1563e0..e9584c46e5 100644 --- a/c/src/lib/libbsp/i960/i960sim/configure.ac +++ b/c/src/lib/libbsp/i960/i960sim/configure.ac @@ -16,11 +16,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -start/Makefile -startup/Makefile -timer/Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/i960/i960sim/console/.cvsignore b/c/src/lib/libbsp/i960/i960sim/console/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/console/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i960/i960sim/console/Makefile.am b/c/src/lib/libbsp/i960/i960sim/console/Makefile.am deleted file mode 100644 index 460dc58e7e..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/console/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared - -PGM = $(ARCH)/console.rel - -C_FILES = console-io.c console-polled.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -S_FILES = mon-syscalls.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/i960/i960sim/start/.cvsignore b/c/src/lib/libbsp/i960/i960sim/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i960/i960sim/start/Makefile.am b/c/src/lib/libbsp/i960/i960sim/start/Makefile.am deleted file mode 100644 index 1de2806a89..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/start/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## -## $Id$ -## - -C_FILES = start.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 -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.c - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(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) - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/i960sim/startup/.cvsignore b/c/src/lib/libbsp/i960/i960sim/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am deleted file mode 100644 index 6d2e5e45f6..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared - -PGM = $(ARCH)/startup.rel - -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.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 = bspclean.c bspstart.c exit.c linkcmds setvec.c - -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/i960/i960sim/timer/.cvsignore b/c/src/lib/libbsp/i960/i960sim/timer/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/timer/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am b/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am deleted file mode 100644 index 8ec4b5ca6a..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared - -PGM = $(ARCH)/timer.rel - -C_FILES = timerstub.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) - -EXTRA_DIST = timer.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/i960sim/wrapup/.cvsignore b/c/src/lib/libbsp/i960/i960sim/wrapup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/wrapup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am deleted file mode 100644 index 98b97a19fd..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - -BSP_FILES = startup clock console timer - -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