From ac73276b1e1be22d5e5f38c30dab57e52c724618 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 16:22:28 +0000 Subject: 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, startup/Makefile.am, timer/Makefile.am, vectors/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, startup/Makefile.am, timer/Makefile.am, vectors/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/powerpc/psim/ChangeLog | 9 ++ c/src/lib/libbsp/powerpc/psim/Makefile.am | 111 +++++++++++++++++++++- c/src/lib/libbsp/powerpc/psim/clock/.cvsignore | 2 - c/src/lib/libbsp/powerpc/psim/clock/Makefile.am | 30 ------ c/src/lib/libbsp/powerpc/psim/configure.ac | 6 -- c/src/lib/libbsp/powerpc/psim/console/.cvsignore | 2 - c/src/lib/libbsp/powerpc/psim/console/Makefile.am | 25 ----- c/src/lib/libbsp/powerpc/psim/shmsupp/.cvsignore | 2 - c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am | 32 ------- c/src/lib/libbsp/powerpc/psim/startup/.cvsignore | 2 - c/src/lib/libbsp/powerpc/psim/startup/Makefile.am | 51 ---------- c/src/lib/libbsp/powerpc/psim/timer/.cvsignore | 2 - c/src/lib/libbsp/powerpc/psim/timer/Makefile.am | 30 ------ c/src/lib/libbsp/powerpc/psim/vectors/.cvsignore | 2 - c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am | 30 ------ c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am | 11 +-- 16 files changed, 122 insertions(+), 225 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/psim/clock/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/psim/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/console/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/psim/console/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/shmsupp/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/psim/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/timer/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/psim/timer/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/vectors/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 1cef479142..9542c8c2bd 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,12 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + shmsupp/Makefile.am, startup/Makefile.am, timer/Makefile.am, + vectors/Makefile.am. Use automake compilation rules. + * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, + startup/Makefile.am, timer/Makefile.am, vectors/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in start/Makefile.am. diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 2511e7f146..5972640a9e 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -6,11 +6,15 @@ 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 startup shmsupp timer vectors @exceptions@ wrapup \ - tools +SUBDIRS = . @exceptions@ wrapup tools +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include_HEADERS += include/coverhd.h EXTRA_DIST = start/start.S @@ -18,6 +22,103 @@ 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/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ + ../../shared/main.c ../../shared/sbrk.c startup/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/clock.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-io.c console/consupp.S \ + ../../shared/console-polled.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_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_DIST += vectors/README + +EXTRA_PROGRAMS += vectors.rel +CLEANFILES += vectors.rel +vectors_rel_SOURCES = vectors/align_h.S 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 + +if HAS_MP +EXTRA_DIST += shmsupp/README + +EXTRA_PROGRAMS += shmsupp.rel +CLEANFILES += shmsupp.rel +shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ + shmsupp/mpisr.c +shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += shmsupp_g.rel +CLEANFILES += shmsupp_g.rel +shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES) +shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += shmsupp$(LIB_VARIANT).rel +endif + all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = @@ -31,7 +132,11 @@ $(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) -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/powerpc/psim/clock/.cvsignore b/c/src/lib/libbsp/powerpc/psim/clock/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/clock/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am deleted file mode 100644 index bcd1265b8a..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/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: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = clock.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index 347443737d..387d395f5d 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -36,12 +36,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -shmsupp/Makefile -startup/Makefile -timer/Makefile -vectors/Makefile wrapup/Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/psim/console/.cvsignore b/c/src/lib/libbsp/powerpc/psim/console/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/console/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am deleted file mode 100644 index 244e4c6d11..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -C_FILES = console-io.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -shared_C_FILES = $(top_srcdir)/../../shared/console-polled.c -OBJS += \ - $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) - -S_FILES = consupp.S -OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< - -noinst_DATA = $(OBJS) - -EXTRA_DIST = $(C_FILES) $(S_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/.cvsignore b/c/src/lib/libbsp/powerpc/psim/shmsupp/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/shmsupp/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am deleted file mode 100644 index d24053bc84..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/shmsupp.rel - -C_FILES = addrconv.c getcfg.c lock.c mpisr.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 - -if HAS_MP -all-local: $(PGM) -endif - -.PRECIOUS: $(PGM) - -EXTRA_DIST = README addrconv.c getcfg.c lock.c mpisr.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/startup/.cvsignore b/c/src/lib/libbsp/powerpc/psim/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am deleted file mode 100644 index a4f6e845a4..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/startup.rel - -C_FILES = bspclean.c bspstart.c setvec.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/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 device-tree - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = bspclean.c bspstart.c device-tree linkcmds setvec.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 - -$(PROJECT_LIB)/device-tree: device-tree $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/device-tree -TMPINSTALL_FILES += $(PROJECT_LIB)/device-tree - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/timer/.cvsignore b/c/src/lib/libbsp/powerpc/psim/timer/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/timer/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am deleted file mode 100644 index 2222cfc1af..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/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: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = timer.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/vectors/.cvsignore b/c/src/lib/libbsp/powerpc/psim/vectors/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/vectors/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am deleted file mode 100644 index 6b3dfe4318..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/vectors.rel - -S_FILES = align_h.S vectors.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 - -# -# (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 = README align_h.S vectors.S - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am index 899a2ceddd..b7a8c14dcb 100644 --- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am @@ -5,14 +5,13 @@ include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +OBJS = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \ + ../console$(LIB_VARIANT).rel ../timer$(LIB_VARIANT).rel \ + ../vectors$(LIB_VARIANT).rel if HAS_MP -BSP_MP_O_PIECES = shmsupp +OBJS += ../shmsupp$(LIB_VARIANT).rel endif -BSP_PIECES = startup clock console timer vectors $(BSP_MP_O_PIECES) - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel +OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel $(ARCH)/libbsp.a: $(OBJS) $(make-library) -- cgit v1.2.3