Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-27 23:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Makefile.am: Merge-in canbus/Makefile.am, clock/Makefile.am,
	console/Makefile.am, irq/Makefile.am, network/Makefile.am,
	startup/Makefile.am, vectors/Makefile.am. Use automake compilation rules.
	* canbus/Makefile.am, clock/Makefile.am, console/Makefile.am,
	irq/Makefile.am, network/Makefile.am, startup/Makefile.am,
	vectors/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2004-01-30 15:59:23 +00:00
parent f439d61ed7
commit 5466140831
18 changed files with 141 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
View File

@@ -1,3 +1,13 @@
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in canbus/Makefile.am, clock/Makefile.am,
console/Makefile.am, irq/Makefile.am, network/Makefile.am,
startup/Makefile.am, vectors/Makefile.am. Use automake compilation rules.
* canbus/Makefile.am, clock/Makefile.am, console/Makefile.am,
irq/Makefile.am, network/Makefile.am, startup/Makefile.am,
vectors/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in start/Makefile.am.

128
c/src/lib/libbsp/powerpc/eth_comm/Makefile.am
View File

@@ -6,8 +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 startup canbus console irq network vectors @exceptions@ \
wrapup
SUBDIRS = . @exceptions@ wrapup
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
@@ -26,6 +25,119 @@ 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 += startup.rel
CLEANFILES += startup.rel
startup_rel_SOURCES = startup/bspstart.c startup/cpuinit.c \
startup/mmutlbtab.c ../../shared/bootcard.c ../../shared/bsplibc.c \
../../shared/bsppost.c ../../shared/main.c ../../shared/sbrk.c \
../../shared/bspclean.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 += canbus.rel
CLEANFILES += canbus.rel
canbus_rel_SOURCES = canbus/canbus.c
canbus_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
canbus_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += canbus_g.rel
CLEANFILES += canbus_g.rel
canbus_g_rel_SOURCES = $(canbus_rel_SOURCES)
canbus_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
canbus_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += canbus$(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 += 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
include_bsp_HEADERS += irq/irq.h
EXTRA_PROGRAMS += irq.rel
CLEANFILES += irq.rel
irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq_asm.S
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
include_bsp_HEADERS += vectors/vectors.h
EXTRA_PROGRAMS += vectors.rel
CLEANFILES += vectors.rel
vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.S \
vectors/vectors.h
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
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)
EXTRA_DIST += times
@@ -62,6 +174,18 @@ $(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
$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
$(PROJECT_INCLUDE)/bsp/vectors.h: vectors/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)
CLEANFILES += $(TMPINSTALL_FILES)

2
c/src/lib/libbsp/powerpc/eth_comm/canbus/.cvsignore
View File

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

30
c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am
View File

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

2
c/src/lib/libbsp/powerpc/eth_comm/clock/.cvsignore
View File

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

15
c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am
View File

@@ -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

7
c/src/lib/libbsp/powerpc/eth_comm/configure.ac
View File

@@ -39,13 +39,6 @@ RTEMS_BSPOPTS_HELP([DISPATCH_HANDLER_STAT],
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
clock/Makefile
canbus/Makefile
console/Makefile
irq/Makefile
network/Makefile
startup/Makefile
vectors/Makefile
wrapup/Makefile])
RTEMS_PPC_EXCEPTIONS([new])

2
c/src/lib/libbsp/powerpc/eth_comm/console/.cvsignore
View File

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

30
c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am
View File

@@ -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

2
c/src/lib/libbsp/powerpc/eth_comm/irq/.cvsignore
View File

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

41
c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am
View File

@@ -1,41 +0,0 @@
##
## $Id$
##
include_bspdir = $(includedir)/bsp
C_FILES = irq.c irq_init.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
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)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
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

2
c/src/lib/libbsp/powerpc/eth_comm/network/.cvsignore
View File

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

34
c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am
View File

@@ -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 = README network.c
include $(top_srcdir)/../../../../automake/local.am

2
c/src/lib/libbsp/powerpc/eth_comm/startup/.cvsignore
View File

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

50
c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am
View File

@@ -1,50 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/startup.rel
C_FILES = bspstart.c cpuinit.c mmutlbtab.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/bspclean.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 = 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

2
c/src/lib/libbsp/powerpc/eth_comm/vectors/.cvsignore
View File

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

43
c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am
View File

@@ -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

16
c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am
View File

@@ -2,19 +2,13 @@
## $Id$
##
# We only build the networking device driver if HAS_NETWORKING was defined
OBJS = ../startup$(LIB_VARIANT).rel ../canbus$(LIB_VARIANT).rel \
../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \
../pclock$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel
if HAS_NETWORKING
NETWORKING = network
OBJS += ../network$(LIB_VARIANT).rel
endif
BSP_PIECES = clock irq startup start canbus vectors console $(NETWORKING)
# pieces to pick up out of libcpu/ppc
# CPU_PIECES = mpc860/clock mpc860/timer mpc860/console-generic \
# mpc860/vectors
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \
OBJS += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \