From 5866f81c935a3799e0f0772a7ecc7fbb4d2f2beb Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 29 Jan 2004 02:17:07 +0000 Subject: 2004-01-29 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/c4x/c4xsim/ChangeLog | 11 +++ c/src/lib/libbsp/c4x/c4xsim/Makefile.am | 110 ++++++++++++++++++++++-- c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am | 30 ------- c/src/lib/libbsp/c4x/c4xsim/configure.ac | 8 +- c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am | 32 ------- c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am | 37 -------- c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am | 45 ---------- c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am | 30 ------- c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am | 22 ----- 9 files changed, 115 insertions(+), 210 deletions(-) delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 93f9438c51..9113f15d6c 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,14 @@ +2004-01-29 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + start/Makefile.am, startup/Makefile.am, timer/Makefile.am, + wrapup/Makefile.am. + Use automake compilation rules. + * clock/Makefile.am, console/Makefile.am, start/Makefile.am, + startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: + Remove. + * configure.ac: Reflect changes above. + 2004-01-28 Ralf Corsepius * configure.ac: Add nostdinc to AUTOMAKE_OPTIONS. diff --git a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am index 13d7cd97a4..1ae719156e 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am @@ -6,29 +6,125 @@ 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 = . start startup console clock timer wrapup tools +SUBDIRS = . tools +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include_HEADERS += include/simio.h -nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h +nodist_include_HEADERS += ../../shared/include/coverhd.h + +EXTRA_DIST = start/start.S +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 = ../../shared/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c startup/bspstart.c ../../shared/main.c \ + ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \ + ../shared/c3xspurious.c ../shared/c4xspurious.c \ + ../shared/bspspuriousinit.c startup/spurious.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 += console.rel +CLEANFILES += console.rel +console_rel_SOURCES = console/consolereserveresources.c console/debugio.c \ + console/simio.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 += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = clock/clock.c +clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -all-local: $(PREINSTALL_FILES) +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) -EXTRA_DIST = times +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 + +EXTRA_LIBRARIES = libbsp.a +CLEANFILES += libbsp.a +libbsp_a_SOURCES = +libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ + clock$(LIB_VARIANT).rel timer$(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 PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/simio.h: include/simio.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/simio.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/simio.h -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -CLEANFILES = $(PREINSTALL_FILES) +$(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) + +$(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/c4x/c4xsim/clock/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am deleted file mode 100644 index 0fd03441ea..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/clock.rel - -C_FILES = clock.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/c4x/c4xsim/configure.ac b/c/src/lib/libbsp/c4x/c4xsim/configure.ac index c555bde8ae..e4739c1461 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/configure.ac +++ b/c/src/lib/libbsp/c4x/c4xsim/configure.ac @@ -18,11 +18,5 @@ RTEMS_PROG_CCAS RTEMS_CONFIG_BUILD_SUBDIRS(tools) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -start/Makefile -startup/Makefile -timer/Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am deleted file mode 100644 index 978f4b722c..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared - -PGM = $(ARCH)/console.rel - -C_FILES = console.c consolereserveresources.c debugio.c simio.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/c4x/c4xsim/start/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am deleted file mode 100644 index 8e096cebcd..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -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 diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am deleted file mode 100644 index 45241b63d2..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am +++ /dev/null @@ -1,45 +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 c3xspurious.c c4xspurious.c bspspuriousinit.c spurious.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 - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = bspclean.c bspstart.c linkcmds setvec.c spurious.c - -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/c4x/c4xsim/timer/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am deleted file mode 100644 index 89cd2f36f3..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/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/c4x/c4xsim/wrapup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am deleted file mode 100644 index c660825bdf..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - -BSP_PIECES = startup console clock timer -# pieces to pick up out of libcpu/sparc -CPU_PIECES = - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).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