From eb40b1ce141db0b0774367477ffff5493578682d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 27 Jan 2004 13:46:50 +0000 Subject: 2004-01-27 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, network/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, network/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 9 ++ c/src/lib/libbsp/m68k/gen68302/Makefile.am | 119 +++++++++++++++++++-- c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am | 30 ------ c/src/lib/libbsp/m68k/gen68302/configure.ac | 9 +- c/src/lib/libbsp/m68k/gen68302/console/Makefile.am | 30 ------ c/src/lib/libbsp/m68k/gen68302/network/Makefile.am | 34 ------ c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am | 46 -------- c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am | 33 ------ c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am | 25 ----- 9 files changed, 121 insertions(+), 214 deletions(-) delete mode 100644 c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/gen68302/console/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/gen68302/network/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index e81830b9e1..20cb4d2ba6 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,12 @@ +2004-01-27 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + network/Makefile.am, startup/Makefile.am, timer/Makefile.am, + wrapup/Makefile.am. Use automake compilation rules. + * clock/Makefile.am, console/Makefile.am, network/Makefile.am, + startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-21 Ralf Corsepius * Makefile.am: Add PREINSTALL_DIRS. diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 896004218c..2918350f5d 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -7,20 +7,118 @@ 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 -SUBDIRS = . startup clock console timer network wrapup +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = include_HEADERS += include/coverhd.h include_HEADERS += include/m302_int.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 = start$(LIB_VARIANT).$(OBJEXT) -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) +dist_project_lib_DATA += startup/linkcmds + +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/m68kpretaskinghook.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 += 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 += 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 += timer.rel +CLEANFILES += timer.rel +timer_rel_SOURCES = timer/timer.c timer/timerisr.S +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 +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 + +EXTRA_LIBRARIES = libbsp.a +CLEANFILES += libbsp.a +libbsp_a_SOURCES = +libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ + console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +if HAS_NETWORKING +libbsp_a_LIBADD += network$(LIB_VARIANT).rel +endif +libbsp_a_LIBADD += \ + ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc$(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) @@ -35,13 +133,16 @@ $(PROJECT_INCLUDE)/m302_int.h: include/m302_int.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m302_int.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/m302_int.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) -include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am deleted file mode 100644 index 01bde7b3e4..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68302/configure.ac b/c/src/lib/libbsp/m68k/gen68302/configure.ac index eadb0e2194..f5084902f8 100644 --- a/c/src/lib/libbsp/m68k/gen68302/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68302/configure.ac @@ -13,17 +13,12 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS +RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -network/Makefile -startup/Makefile -timer/Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am deleted file mode 100644 index 9f4fde7145..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am +++ /dev/null @@ -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: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = console.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am deleted file mode 100644 index 35260c6e8f..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am +++ /dev/null @@ -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: $(OBJS) $(PGM) -endif - -.PRECIOUS: $(PGM) - -EXTRA_DIST = network.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am deleted file mode 100644 index af467a903d..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared - -PGM = $(ARCH)/startup.rel - -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c \ - m68kpretaskinghook.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 - -# 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 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 diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am deleted file mode 100644 index 88f8b2ff5b..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/timer.rel - -C_FILES = timer.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -S_FILES = timerisr.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) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = timer.c timerisr.S - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am deleted file mode 100644 index acf1802a8b..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -# We only build the networking device driver if HAS_NETWORKING was defined -if HAS_NETWORKING -NETWORKING_DRIVER = network -endif - -BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER) - -# 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 - -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 -- cgit v1.2.3