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

* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
	ide/Makefile.am, irq/Makefile.am, network/Makefile.am,
	startup/Makefile.am, vectors/Makefile.am. Use automake compilation rules.
	* clock/Makefile.am, console/Makefile.am, ide/Makefile.am,
	irq/Makefile.am, network/Makefile.am, startup/Makefile.am,
	vectors/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
	* wrapup/Makefile.am: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2004-01-30 23:56:57 +00:00
parent 47caf1c21c
commit 65e6a0f58e
18 changed files with 142 additions and 260 deletions
+11
View File
@@ -1,3 +1,14 @@
2004-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
ide/Makefile.am, irq/Makefile.am, network/Makefile.am,
startup/Makefile.am, vectors/Makefile.am. Use automake compilation rules.
* clock/Makefile.am, console/Makefile.am, ide/Makefile.am,
irq/Makefile.am, network/Makefile.am, startup/Makefile.am,
vectors/Makefile.am: Remove.
* configure.ac: Reflect changes above.
* wrapup/Makefile.am: Reflect changes above.
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Reflect changes to
+125 -4
View File
@@ -6,19 +6,135 @@ 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 irq network ide startup vectors @exceptions@ \
wrapup
SUBDIRS = . @exceptions@ wrapup
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
include_bspdir = $(includedir)/bsp
include_HEADERS += include/coverhd.h
include_bsp_HEADERS = include/mbx.h include/commproc.h include/8xx_immap.h
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = times-mbx821 times-mbx860
dist_project_lib_DATA += startup/linkcmds
EXTRA_PROGRAMS += pclock.rel
CLEANFILES += pclock.rel
pclock_rel_SOURCES = clock/p_clock.c
pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += pclock_g.rel
CLEANFILES += pclock_g.rel
pclock_g_rel_SOURCES = $(pclock_rel_SOURCES)
pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += pclock$(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 += irq.rel
CLEANFILES += irq.rel
irq_rel_SOURCES = irq/irq.c irq/irq_asm.S irq/irq_init.c
irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += irq_g.rel
CLEANFILES += irq_g.rel
irq_g_rel_SOURCES = $(irq_rel_SOURCES)
irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += irq$(LIB_VARIANT).rel
EXTRA_PROGRAMS += ide.rel
CLEANFILES += ide.rel
ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_ide.c
ide_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += ide_g.rel
CLEANFILES += ide_g.rel
ide_g_rel_SOURCES = $(ide_rel_SOURCES)
ide_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
ide_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += ide$(LIB_VARIANT).rel
EXTRA_PROGRAMS += vectors.rel
CLEANFILES += vectors.rel
vectors_rel_SOURCES = vectors/vectors.h vectors/vectors_init.c \
vectors/vectors.S
vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += vectors_g.rel
CLEANFILES += vectors_g.rel
vectors_g_rel_SOURCES = $(vectors_rel_SOURCES)
vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += vectors$(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 \
startup/imbx8xx.c ../../shared/main.c startup/mmutlbtab.c \
../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/start.S
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
if HAS_NETWORKING
network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
EXTRA_PROGRAMS += network.rel
CLEANFILES += network.rel
network_rel_SOURCES = network/network.c
network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
$(network_CPPFLAGS)
network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += network_g.rel
CLEANFILES += network_g.rel
network_g_rel_SOURCES = $(network_rel_SOURCES)
network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
$(network_CPPFLAGS)
network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += network$(LIB_VARIANT).rel
endif
all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
PREINSTALL_DIRS =
TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
@@ -41,8 +157,13 @@ $(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/8xx_immap.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
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
@@ -1,2 +0,0 @@
Makefile
Makefile.in
@@ -1,15 +0,0 @@
##
## $Id$
##
C_FILES = p_clock.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
# the .o files built here will be put into libbsp.a by ../wrapup/Makefile
noinst_DATA = $(OBJS)
include $(top_srcdir)/../../../../automake/local.am
@@ -119,13 +119,6 @@ RTEMS_BSPOPTS_HELP([DISPATCH_HANDLER_STAT],
# Explicitly list a Makefile here
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
irq/Makefile
ide/Makefile
network/Makefile
startup/Makefile
vectors/Makefile
wrapup/Makefile])
RTEMS_PPC_EXCEPTIONS([new])
@@ -1,2 +0,0 @@
Makefile
Makefile.in
@@ -1,30 +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: $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = console.c
include $(top_srcdir)/../../../../automake/local.am
@@ -1,2 +0,0 @@
Makefile.in
Makefile
@@ -1,15 +0,0 @@
##
## Makefile.am,v 1.5 2002/08/11 06:59:03 ralf Exp
##
C_FILES = idecfg.c pcmcia_ide.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
noinst_DATA = $(OBJS)
include $(top_srcdir)/../../../../automake/local.am
@@ -1,2 +0,0 @@
Makefile
Makefile.in
@@ -1,38 +0,0 @@
##
## $Id$
##
C_FILES = irq.c irq_init.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_bspdir = $(includedir)/bsp
include_bsp_HEADERS = irq.h
S_FILES = irq_asm.S
OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
noinst_DATA = $(OBJS)
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = irq.c irq_asm.S irq_init.c
PREINSTALL_DIRS =
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/irq.h: irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
CLEANFILES = $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
include $(top_srcdir)/../../../../automake/local.am
@@ -1,2 +0,0 @@
Makefile
Makefile.in
@@ -1,34 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/network.rel
C_FILES = network.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 += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
$(PGM): $(OBJS)
$(make-rel)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
if HAS_NETWORKING
all-local: $(PGM)
endif
.PRECIOUS: $(PGM)
EXTRA_DIST = network.c
include $(top_srcdir)/../../../../automake/local.am
@@ -1,2 +0,0 @@
Makefile
Makefile.in
@@ -1,53 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/startup.rel
C_FILES = bspstart.c imbx8xx.c mmutlbtab.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
S_FILES = start.S
OBJS += $(S_FILES:%.S=$(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/bspclean.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 $<
$(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 = linkcmds $(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
@@ -1,2 +0,0 @@
Makefile
Makefile.in
@@ -1,43 +0,0 @@
##
## $Id$
##
C_FILES = vectors_init.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_bspdir = $(includedir)/bsp
include_bsp_HEADERS = vectors.h
S_FILES = vectors.S
S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
OBJS = $(S_O_FILES) $(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: $(PREINSTALL_FILES) $(OBJS)
PREINSTALL_DIRS =
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
CLEANFILES = $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
include $(top_srcdir)/../../../../automake/local.am
@@ -2,16 +2,15 @@
## $Id$
##
# We only build the networking device driver if HAS_NETWORKING was defined
OBJS = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \
../ide$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \
../console$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel
if HAS_NETWORKING
NETWORKING = network
OBJS += ../network$(LIB_VARIANT).rel
endif
BSP_PIECES = clock irq ide startup console vectors $(NETWORKING)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
OBJS += ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \
../../../../libcpu/powerpc/shared/cache$(LIB_VARIANT).rel \
../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \
../../../../libcpu/powerpc/mpc8xx/clock$(LIB_VARIANT).rel \
../../../../libcpu/powerpc/mpc8xx/console-generic$(LIB_VARIANT).rel \