diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/Makefile.am | 96 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am | 33 |
3 files changed, 37 insertions, 96 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 24a7f6245b..ba258cb6e0 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-11-22 Jennifer Averett <jennifer@OARcorp.com> PR 617/bsps diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 8b21aba9a4..8b7e116a93 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -15,30 +15,29 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h + nodist_include_HEADERS = include/bspopts.h +DISTCLEANFILES = include/bspopts.h -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = include_bspdir = $(includedir)/bsp include_HEADERS += include/coverhd.h EXTRA_DIST = start/start.S -start$(LIB_VARIANT).$(OBJEXT): start/start.S +start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -DASM -o $@ -c $< -project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA = start.$(OBJEXT) EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti$(LIB_VARIANT).$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S +rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -DASM -o $@ -c $< -project_lib_DATA += rtems_crti$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += 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 \ @@ -46,95 +45,42 @@ startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.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 += pclock.rel -CLEANFILES += pclock.rel +noinst_PROGRAMS += pclock.rel pclock_rel_SOURCES = ../shared/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 - -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += 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 - include_bsp_HEADERS = irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += 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 - EXTRA_DIST += vectors/README -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = vectors/align_h.S vectors/vectors.S \ ../../powerpc/shared/vectors/vectors_init.c 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 - include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h if HAS_MP EXTRA_DIST += shmsupp/README -EXTRA_PROGRAMS += shmsupp.rel -CLEANFILES += shmsupp.rel +noinst_PROGRAMS += 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) $(TMPINSTALL_FILES) @@ -178,13 +124,13 @@ $(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): 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)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) -$(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT): rtems_crti$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds @@ -198,8 +144,8 @@ $(PROJECT_INCLUDE)/bsp/vectors.h: ../../powerpc/shared/vectors/vectors.h $(PROJE $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am index 65bcce40e9..b3180e94a2 100644 --- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am @@ -4,31 +4,22 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ - ../pclock$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \ - ../irq$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel -___libbsp_a_LIBADD += \ - ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../pclock.rel ../console.rel ../irq.rel \ + ../vectors.rel +___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel if HAS_MP -___libbsp_a_LIBADD += ../shmsupp$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../shmsupp.rel endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(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 +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel include $(top_srcdir)/../../../../automake/local.am |