diff options
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/ChangeLog | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/Makefile.am | 140 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/clock/Makefile.am | 30 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/configure.ac | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/console/Makefile.am | 30 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am | 30 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am | 34 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/startup/Makefile.am | 47 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/timer/Makefile.am | 30 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am | 26 |
10 files changed, 146 insertions, 242 deletions
diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog index 923401c128..7358d5199d 100644 --- a/c/src/lib/libbsp/sparc/leon/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon/ChangeLog @@ -1,3 +1,14 @@ +2004-01-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in clock/Makefile.am, leon_open_eth/Makefile.am, + startup/Makefile.am, console/Makefile.am, gnatsupp/Makefile.am, + timer/Makefile.am, wrapup/Makefile.am. + Use automake compilation rules. + * clock/Makefile.am, leon_open_eth/Makefile.am, startup/Makefile.am, + console/Makefile.am, gnatsupp/Makefile.am, timer/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. diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am index 30906ad0cc..4f66064992 100644 --- a/c/src/lib/libbsp/sparc/leon/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/Makefile.am @@ -7,22 +7,144 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +EXTRA_DIST = +noinst_DATA = + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . startup gnatsupp console clock timer leon_open_eth wrapup tools +SUBDIRS = . tools include_HEADERS += include/leon.h include_HEADERS += include/coverhd.h -sparc_shared_S_FILES = $(top_srcdir)/../../sparc/shared/start.S -$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../../sparc/shared/start.S $(ARCH)/$(dirstamp) +EXTRA_DIST += ../../sparc/shared/start.S +start$(LIB_VARIANT).$(OBJEXT): ../../sparc/shared/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 + +EXTRA_PROGRAMS += startup.rel +CLEANFILES += startup.rel +startup_rel_SOURCES = ../shared/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c ../shared/bspstart.c ../../shared/main.c \ + ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \ + startup/spurious.c startup/boardinit.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 + +EXTRA_PROGRAMS += gnatsupp.rel +CLEANFILES += gnatsupp.rel +gnatsupp_rel_SOURCES = gnatsupp/gnatsupp.c ../shared/gnatcommon.c +gnatsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +gnatsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += gnatsupp_g.rel +CLEANFILES += gnatsupp_g.rel +gnatsupp_g_rel_SOURCES = $(gnatsupp_rel_SOURCES) +gnatsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +gnatsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += gnatsupp$(LIB_VARIANT).rel + +EXTRA_PROGRAMS += console.rel +CLEANFILES += console.rel +console_rel_SOURCES = console/console.c console/consolereserveresources.c \ + console/debugputs.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 += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = clock/ckinit.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 += 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 + +if HAS_NETWORKING +leon_open_eth_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +EXTRA_PROGRAMS += leon_open_eth.rel +CLEANFILES += leon_open_eth.rel +leon_open_eth_rel_SOURCES = leon_open_eth/leon_open_eth.c +leon_open_eth_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ + $(leon_open_eth_CPPFLAGS) +leon_open_eth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += leon_open_eth_g.rel +CLEANFILES += leon_open_eth_g.rel +leon_open_eth_g_rel_SOURCES = $(leon_open_eth_rel_SOURCES) +leon_open_eth_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ + $(leon_open_eth_CPPFLAGS) +leon_open_eth_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += leon_open_eth$(LIB_VARIANT).rel +endif + +EXTRA_LIBRARIES = libbsp.a +CLEANFILES += libbsp.a +libbsp_a_SOURCES = +libbsp_a_LDADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ + clock$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel \ + gnatsupp$(LIB_VARIANT).rel + +if HAS_NETWORKING +libbsp_a_LDADD += leon_open_eth$(LIB_VARIANT).rel +endif + +libbsp_a_LDADD += ../../../libcpu/sparc/cache$(LIB_VARIANT).rel \ + ../../../libcpu/sparc/reg_win$(LIB_VARIANT).rel \ + ../../../libcpu/sparc/syscall$(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) -EXTRA_DIST = times +EXTRA_DIST += times PREINSTALL_DIRS = TMPINSTALL_FILES = @@ -35,11 +157,15 @@ $(PROJECT_INCLUDE)/coverhd.h: 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) diff --git a/c/src/lib/libbsp/sparc/leon/clock/Makefile.am b/c/src/lib/libbsp/sparc/leon/clock/Makefile.am deleted file mode 100644 index 01bde7b3e4..0000000000 --- a/c/src/lib/libbsp/sparc/leon/clock/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/clock.rel - -C_FILES = ckinit.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 = ckinit.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon/configure.ac b/c/src/lib/libbsp/sparc/leon/configure.ac index 0741054e0f..0ce8f853e1 100644 --- a/c/src/lib/libbsp/sparc/leon/configure.ac +++ b/c/src/lib/libbsp/sparc/leon/configure.ac @@ -13,6 +13,7 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS +RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING @@ -37,12 +38,5 @@ RTEMS_BSPOPTS_HELP([SIMSPARC_FAST_IDLE], the wall time required to execute the RTEMS test suites.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -leon_open_eth/Makefile -gnatsupp/Makefile -startup/Makefile -timer/Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/sparc/leon/console/Makefile.am b/c/src/lib/libbsp/sparc/leon/console/Makefile.am deleted file mode 100644 index ac8e2a0cee..0000000000 --- a/c/src/lib/libbsp/sparc/leon/console/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/console.rel - -C_FILES = console.c consolereserveresources.c debugputs.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 consolereserveresources.c debugputs.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am b/c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am deleted file mode 100644 index 9a031cc4e8..0000000000 --- a/c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared - -PGM = $(ARCH)/gnatsupp.rel - -C_FILES = gnatsupp.c gnatcommon.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) - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = gnatsupp.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am b/c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am deleted file mode 100644 index 4e13ab0c17..0000000000 --- a/c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## -## Makefile.am,v 1.5 2002/12/14 08:17:45 ralf Exp -## - -PGM = $(ARCH)/leon_open_eth.rel - -C_FILES = leon_open_eth.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: $(OBJS) $(PGM) -endif - -.PRECIOUS: $(PGM) - -EXTRA_DIST = leon_open_eth.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon/startup/Makefile.am b/c/src/lib/libbsp/sparc/leon/startup/Makefile.am deleted file mode 100644 index b0b7e249c5..0000000000 --- a/c/src/lib/libbsp/sparc/leon/startup/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared - -PGM = $(ARCH)/startup.rel - -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c main.c bootcard.c sbrk.c \ - setvec.c spurious.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -S_FILES = boardinit.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) $(S_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 - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = linkcmds setvec.c spurious.c boardinit.S - -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/sparc/leon/timer/Makefile.am b/c/src/lib/libbsp/sparc/leon/timer/Makefile.am deleted file mode 100644 index 89cd2f36f3..0000000000 --- a/c/src/lib/libbsp/sparc/leon/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/sparc/leon/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am deleted file mode 100644 index 6c5cd1bd95..0000000000 --- a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - -# We only build the networking device driver if HAS_NETWORKING was defined -if HAS_NETWORKING -NETWORKING_DRIVER = leon_open_eth -endif - -BSP_PIECES = startup console clock timer gnatsupp $(NETWORKING_DRIVER) - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/sparc/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/sparc/reg_win$(LIB_VARIANT).rel \ - ../../../../libcpu/sparc/syscall$(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 |