From 31b1cffc226a5848e396fc88da8b832d41d34f5c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 31 Jan 2004 11:27:23 +0000 Subject: 2004-01-31 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/mips/genmongoosev/ChangeLog | 9 ++ c/src/lib/libbsp/mips/genmongoosev/Makefile.am | 114 ++++++++++++++++++--- .../lib/libbsp/mips/genmongoosev/clock/.cvsignore | 2 - .../lib/libbsp/mips/genmongoosev/clock/Makefile.am | 33 ------ c/src/lib/libbsp/mips/genmongoosev/configure.ac | 7 +- .../libbsp/mips/genmongoosev/console/.cvsignore | 2 - .../libbsp/mips/genmongoosev/console/Makefile.am | 32 ------ .../libbsp/mips/genmongoosev/startup/.cvsignore | 2 - .../libbsp/mips/genmongoosev/startup/Makefile.am | 49 --------- .../lib/libbsp/mips/genmongoosev/timer/.cvsignore | 2 - .../lib/libbsp/mips/genmongoosev/timer/Makefile.am | 30 ------ .../lib/libbsp/mips/genmongoosev/wrapup/.cvsignore | 2 - .../libbsp/mips/genmongoosev/wrapup/Makefile.am | 22 ---- 13 files changed, 112 insertions(+), 194 deletions(-) delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/clock/.cvsignore delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/console/.cvsignore delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/timer/.cvsignore delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/wrapup/.cvsignore delete mode 100644 c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am diff --git a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog index 48a6195ba5..474c8fa159 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog +++ b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog @@ -1,3 +1,12 @@ +2004-01-31 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake + compilation rules. + * clock/Makefile.am, console/Makefile.am, startup/Makefile.am, + timer/Makefile.am, wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-31 Ralf Corsepius * start/start.S: Replace #-ASM-style comments with C-/**/ comments. diff --git a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am index d577353dd6..d063e0c3d1 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am @@ -7,35 +7,125 @@ 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 console timer wrapup +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = -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/regs.S start/mg5.h +start$(LIB_VARIANT).$(OBJEXT): start/start.S ${CCASCOMPILE} -DASM -o $@ -c $< -EXTRA_DIST = $(S_FILES) start/regs.S start/mg5.h -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) + +dist_project_lib_DATA += startup/linkcmds + +startup_CPPFLAGS = -I$(srcdir)/../../mips/shared/gdbstub +EXTRA_PROGRAMS += startup.rel +CLEANFILES += startup.rel +startup_rel_SOURCES = ../../mips/shared/gdbstub/mips-stub.c \ + ../../shared/gdbstub/rtems-stub-glue.c ../../shared/bspclean.c \ + ../../shared/bsplibc.c ../../shared/bsppost.c startup/bspstart.c \ + ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \ + ../../shared/gnatinstallhandler.c ../../shared/setvec.c \ + startup/gdb-support.c +startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ +$(startup_CPPFLAGS) +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_CPPFLAGS) +startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += startup$(LIB_VARIANT).rel + +# FIXME: clockdrv.c and clockdrv_sheck.c are structurally flawed +clock_CPPFLAGS = -I$(srcdir)/../../shared +EXTRA_DIST += ./../shared/clockdrv_shell.c +EXTRA_PROGRAMS += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = clock/clockdrv.c +clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ +$(clock_CPPFLAGS) +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_CPPFLAGS) +clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += clock$(LIB_VARIANT).rel + +EXTRA_PROGRAMS += console.rel +CLEANFILES += console.rel +console_rel_SOURCES = console/conscfg.c ../../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_PROGRAMS += timer.rel +CLEANFILES += timer.rel +timer_rel_SOURCES = timer/timer.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/mips/shared/cache$(LIB_VARIANT).rel \ + ../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \ + ../../../libcpu/mips/mongoosev/duart$(LIB_VARIANT).rel \ + ../../../libcpu/mips/mongoosev/vectorisrs$(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) 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 -$(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) -include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/genmongoosev/clock/.cvsignore b/c/src/lib/libbsp/mips/genmongoosev/clock/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/clock/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am deleted file mode 100644 index 8100636364..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am +++ /dev/null @@ -1,33 +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 += -# - -# to include the shared clock driver shell -AM_CPPFLAGS += -I$(top_srcdir)/../../shared - -$(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 = clockdrv.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/genmongoosev/configure.ac b/c/src/lib/libbsp/mips/genmongoosev/configure.ac index cb2143b96c..c6ea50dd99 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/configure.ac +++ b/c/src/lib/libbsp/mips/genmongoosev/configure.ac @@ -17,10 +17,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -startup/Makefile -timer/Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/.cvsignore b/c/src/lib/libbsp/mips/genmongoosev/console/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/console/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am deleted file mode 100644 index 7589081442..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared - -PGM = $(ARCH)/console.rel - -C_FILES = conscfg.c 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) - -EXTRA_DIST = conscfg.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/genmongoosev/startup/.cvsignore b/c/src/lib/libbsp/mips/genmongoosev/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am deleted file mode 100644 index 29eb0e6b77..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/gdbstub:@srcdir@/../../../shared/gdbstub - -PGM = $(ARCH)/startup.rel - -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ - gnatinstallhandler.c setvec.c mips-stub.c gdb-support.c \ - rtems-stub-glue.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 += -# - -AM_CPPFLAGS += -I@srcdir@/../../shared/gdbstub - -$(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/mips/genmongoosev/timer/.cvsignore b/c/src/lib/libbsp/mips/genmongoosev/timer/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/timer/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am deleted file mode 100644 index 89cd2f36f3..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/timer.rel - -C_FILES = timer.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/mips/genmongoosev/wrapup/.cvsignore b/c/src/lib/libbsp/mips/genmongoosev/wrapup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/wrapup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am deleted file mode 100644 index 082ea5f70a..0000000000 --- a/c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am +++ /dev/null @@ -1,22 +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/mips/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \ - ../../../../libcpu/mips/mongoosev/duart$(LIB_VARIANT).rel \ - ../../../../libcpu/mips/mongoosev/vectorisrs$(LIB_VARIANT).rel - -$(ARCH)/libbsp.a: ${OBJS} - $(make-library) - -noinst_DATA = $(ARCH)/libbsp.a - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3