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

* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
	scv64/Makefile.am, sonic/Makefile.am, start/Makefile.am,
	startup/Makefile.am, timer/Makefile.am, tod/Makefile.am. Use automake
	compilation rules.
	* clock/Makefile.am, console/Makefile.am, scv64/Makefile.am,
	sonic/Makefile.am, start/Makefile.am, startup/Makefile.am,
	timer/Makefile.am, tod/Makefile.am: Remove.
	* configure.ac, wrapup/Makefile.am: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2004-01-30 17:12:37 +00:00
parent 1d90b6d1cd
commit fb6b168f61
19 changed files with 126 additions and 217 deletions

View File

@@ -1,3 +1,14 @@
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
scv64/Makefile.am, sonic/Makefile.am, start/Makefile.am,
startup/Makefile.am, timer/Makefile.am, tod/Makefile.am. Use automake
compilation rules.
* clock/Makefile.am, console/Makefile.am, scv64/Makefile.am,
sonic/Makefile.am, start/Makefile.am, startup/Makefile.am,
timer/Makefile.am, tod/Makefile.am: Remove.
* configure.ac, wrapup/Makefile.am: Reflect changes above.
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in start/Makefile.am.

View File

@@ -6,7 +6,7 @@ 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 = . clock console startup timer scv64 tod sonic @exceptions@ wrapup
SUBDIRS = . @exceptions@ wrapup
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
@@ -24,6 +24,112 @@ start$(LIB_VARIANT).$(OBJEXT): start/start.S
${CCASCOMPILE} -DASM -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/clock.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/conscfg.c console/debugio.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 += scv64.rel
CLEANFILES += scv64.rel
scv64_rel_SOURCES = scv64/scv64.c
scv64_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
scv64_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += scv64_g.rel
CLEANFILES += scv64_g.rel
scv64_g_rel_SOURCES = $(scv64_rel_SOURCES)
scv64_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
scv64_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += scv64$(LIB_VARIANT).rel
EXTRA_PROGRAMS += startup.rel
CLEANFILES += startup.rel
startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
../../shared/main.c ../../shared/sbrk.c startup/setvec.c \
startup/genpvec.c startup/vmeintr.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 += 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_PROGRAMS += tod.rel
CLEANFILES += tod.rel
tod_rel_SOURCES = 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
if HAS_NETWORKING
sonic_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
EXTRA_PROGRAMS += sonic.rel
CLEANFILES += sonic.rel
sonic_rel_SOURCES = sonic/dmvsonic.c
sonic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(sonic_CPPFLAGS)
sonic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += sonic_g.rel
CLEANFILES += sonic_g.rel
sonic_g_rel_SOURCES = $(sonic_rel_SOURCES)
sonic_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(sonic_CPPFLAGS)
sonic_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += sonic$(LIB_VARIANT).rel
endif
all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
EXTRA_DIST += QUIRKS README.net STATUS cable.doc times
@@ -47,6 +153,10 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PR
$(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)

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@@ -1,15 +0,0 @@
##
## $Id$
##
C_FILES = clock.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
noinst_DATA = $(OBJS)
EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -49,13 +49,6 @@ RTEMS_BSPOPTS_HELP([DMV177_USE_INSTRUCTION_CACHE],
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
scv64/Makefile
sonic/Makefile
startup/Makefile
timer/Makefile
tod/Makefile
wrapup/Makefile
])

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@@ -1,22 +0,0 @@
##
## $Id$
##
C_FILES = conscfg.c debugio.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
shared_C_FILES = $(top_srcdir)/../../shared/console.c
OBJS += \
$(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
noinst_DATA = $(OBJS)
EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@@ -1,15 +0,0 @@
##
## $Id$
##
C_FILES = scv64.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
noinst_DATA = $(OBJS)
EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@@ -1,19 +0,0 @@
##
## $Id$
##
C_FILES = dmvsonic.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
if HAS_NETWORKING
noinst_DATA = $(OBJS)
endif
EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,35 +0,0 @@
##
## $Id$
##
S_FILES = start.S
OBJS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
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.S
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

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@@ -1,44 +0,0 @@
##
## $Id$
##
C_FILES = bspclean.c bspstart.c setvec.c genpvec.c vmeintr.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
shared_C_FILES = $(top_srcdir)/../../shared/bootcard.c
shared_C_FILES += $(top_srcdir)/../../shared/bsplibc.c
shared_C_FILES += $(top_srcdir)/../../shared/bsppost.c
shared_C_FILES += $(top_srcdir)/../../shared/main.c
shared_C_FILES += $(top_srcdir)/../../shared/sbrk.c
shared_C_FILES += $(top_srcdir)/../../shared/gnatinstallhandler.c
OBJS += \
$(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
noinst_DATA = $(OBJS)
project_lib_DATA = linkcmds
all-local: $(TMPINSTALL_FILES)
EXTRA_DIST = $(C_FILES)
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

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@@ -1,15 +0,0 @@
##
## $Id$
##
C_FILES = timer.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
noinst_DATA = $(OBJS)
EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@@ -1,22 +0,0 @@
##
## $Id$
##
C_FILES = todcfg.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
shared_C_FILES = $(top_srcdir)/../../shared/tod.c
OBJS += \
$(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
noinst_DATA = $(OBJS)
EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -2,17 +2,13 @@
## $Id$
##
# We only build the networking device driver if HAS_NETWORKING was defined
OBJS = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \
../console$(LIB_VARIANT).rel ../scv64$(LIB_VARIANT).rel \
../timer$(LIB_VARIANT).rel ../tod$(LIB_VARIANT).rel
if HAS_NETWORKING
NETWORKING = sonic
OBJS += ../sonic$(LIB_VARIANT).rel
endif
# pieces specific to this BSP
BSP_PIECES = startup clock console scv64 timer tod $(NETWORKING)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), \
../$(piece)/$(ARCH)/*.$(OBJEXT))
OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel