2004-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Merge-in console/Makefile.am, i2c/Makefile.am,
	nvram/Makefile.am, startup/Makefile.am, tod/Makefile.am,
	wrapup/Makefile.am.
	Use automake compilation rules.
	* console/Makefile.am, i2c/Makefile.am, nvram/Makefile.am,
	startup/Makefile.am, tod/Makefile.am, wrapup/Makefile.am:
	Remove.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2004-01-28 11:31:53 +00:00
parent 86b448ab4c
commit 155881a13b
9 changed files with 133 additions and 215 deletions

View File

@@ -1,3 +1,14 @@
2004-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in console/Makefile.am, i2c/Makefile.am,
nvram/Makefile.am, startup/Makefile.am, tod/Makefile.am,
wrapup/Makefile.am.
Use automake compilation rules.
* console/Makefile.am, i2c/Makefile.am, nvram/Makefile.am,
startup/Makefile.am, tod/Makefile.am, wrapup/Makefile.am:
Remove.
* configure.ac: Reflect changes above.
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.

View File

@@ -7,25 +7,123 @@ 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
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
SUBDIRS = . startup console i2c tod nvram tools wrapup
SUBDIRS = . tools
include_HEADERS += include/coverhd.h
include_HEADERS += include/i2c.h
include_HEADERS += include/i2cdrv.h
include_HEADERS += include/ds1307.h
include_HEADERS += include/nvram.h
nodist_include_HEADERS += $(top_srcdir)/../../shared/tod.h
nodist_include_HEADERS += ../../shared/tod.h
EXTRA_DIST = times
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 = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
dist_project_lib_DATA += startup/linkcmds startup/gdbinit \
startup/linkcmds.flash
EXTRA_PROGRAMS += startup.rel
CLEANFILES += startup.rel
startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppost.c ../shared/m68kpretaskinghook.c startup/bspstart.c \
startup/init5206e.c ../../shared/bootcard.c ../../shared/main.c \
../../shared/sbrk.c ../shared/setvec.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 += console.rel
CLEANFILES += console.rel
console_rel_SOURCES = console/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 += i2c.rel
CLEANFILES += i2c.rel
i2c_rel_SOURCES = i2c/i2c.c i2c/i2cdrv.c
i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += i2c_g.rel
CLEANFILES += i2c_g.rel
i2c_g_rel_SOURCES = $(i2c_rel_SOURCES)
i2c_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
i2c_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += i2c$(LIB_VARIANT).rel
EXTRA_PROGRAMS += tod.rel
CLEANFILES += tod.rel
tod_rel_SOURCES = tod/ds1307.c tod/todcfg.c ../../shared/tod.c
tod_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += tod_g.rel
CLEANFILES += tod_g.rel
tod_g_rel_SOURCES = $(tod_rel_SOURCES)
tod_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
tod_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += tod$(LIB_VARIANT).rel
EXTRA_PROGRAMS += nvram.rel
CLEANFILES += nvram.rel
nvram_rel_SOURCES = nvram/nvram.c
nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += nvram_g.rel
CLEANFILES += nvram_g.rel
nvram_g_rel_SOURCES = $(nvram_rel_SOURCES)
nvram_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
nvram_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += nvram$(LIB_VARIANT).rel
EXTRA_LIBRARIES = libbsp.a
CLEANFILES += libbsp.a
libbsp_a_SOURCES =
libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
i2c$(LIB_VARIANT).rel tod$(LIB_VARIANT).rel nvram$(LIB_VARIANT).rel
libbsp_a_LIBADD += \
../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \
../../../libcpu/@RTEMS_CPU@/mcf5206/clock$(LIB_VARIANT).rel \
../../../libcpu/@RTEMS_CPU@/mcf5206/console$(LIB_VARIANT).rel \
../../../libcpu/@RTEMS_CPU@/mcf5206/timer$(LIB_VARIANT).rel \
../../../libcpu/@RTEMS_CPU@/mcf5206/mbus$(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)
@@ -52,17 +150,28 @@ $(PROJECT_INCLUDE)/nvram.h: include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h
$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.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
$(PROJECT_LIB)/gdbinit: startup/gdbinit $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/gdbinit
TMPINSTALL_FILES += $(PROJECT_LIB)/gdbinit
$(PROJECT_LIB)/linkcmds.flash: startup/linkcmds.flash $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.flash
TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash
CLEANFILES += $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
CLEANFILES += $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -13,17 +13,12 @@ RTEMS_BSP_CONFIGURE
RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
RTEMS_CHECK_NETWORKING
AC_CONFIG_SUBDIRS(tools)
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
startup/Makefile
console/Makefile
i2c/Makefile
tod/Makefile
nvram/Makefile
wrapup/Makefile])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

View File

@@ -1,29 +0,0 @@
##
## $Id$
##
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)
EXTRA_DIST = console.c
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,29 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/i2c.rel
C_FILES = i2c.c i2cdrv.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 = $(C_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,29 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/nvram.rel
C_FILES = nvram.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 = nvram.c
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,55 +0,0 @@
##
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM = $(ARCH)/startup.rel
C_FILES = bspclean.c bsplibc.c bsppost.c m68kpretaskinghook.c bspstart.c \
init5206e.c bootcard.c main.c sbrk.c setvec.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 gdbinit linkcmds.flash
# 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 init5206e.c linkcmds linkcmds.flash \
gdbinit
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
$(PROJECT_LIB)/gdbinit: gdbinit $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/gdbinit
TMPINSTALL_FILES += $(PROJECT_LIB)/gdbinit
$(PROJECT_LIB)/linkcmds.flash: linkcmds.flash $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.flash
TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash
CLEANFILES = $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,31 +0,0 @@
##
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = $(ARCH)/tod.rel
C_FILES = ds1307.c todcfg.c tod.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 = ds1307.c todcfg.c
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,24 +0,0 @@
##
## $Id$
##
BSP_PIECES = startup console i2c tod nvram
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/mcf5206/clock$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/mcf5206/console$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/mcf5206/timer$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/mcf5206/mbus$(LIB_VARIANT).rel
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
$(ARCH)/libbsp.a: $(OBJS)
$(make-library)
noinst_DATA = $(ARCH)/libbsp.a
include $(top_srcdir)/../../../../automake/local.am