diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-03 04:16:13 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-03 04:16:13 +0000 |
commit | 71cbb666a432fccaaf351493465edca9fad3f719 (patch) | |
tree | 57b03c1bf092765652e00626b2fb30d3da8b6b9d /c/src/lib/libbsp/powerpc/mvme5500 | |
parent | 2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-71cbb666a432fccaaf351493465edca9fad3f719.tar.bz2 |
2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am, wrapup/Makefile.am: Remove build-variant support.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mvme5500')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 148 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am | 37 |
3 files changed, 42 insertions, 147 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index b0c85a6679..14cd3dbb43 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-10-26 Ralf Corsepius <ralf_corsepius@rtems.org> * Makefile.am: Fix network_CPPFLAGS. Reformat. diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 191731e7b8..f448bc1ca9 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -15,12 +15,12 @@ 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 nodist_include_HEADERS += ../../shared/include/coverhd.h -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = include_bspdir = $(includedir)/bsp @@ -30,8 +30,7 @@ dist_project_lib_DATA += startup/linkcmds # UNUSED EXTRA_DIST = startup/bootpstuff.c -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/bspstart.c \ ../../powerpc/shared/startup/pgtbl_setup.c startup/pgtbl_activate.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ @@ -40,195 +39,98 @@ startup_rel_SOURCES = startup/bspstart.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 = ../../powerpc/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 - ### include_bsp_HEADERS = ../../powerpc/shared/console/uart.h -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/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 - ### include_bsp_HEADERS += pci/gtpcireg.h pci/pci.h -EXTRA_PROGRAMS += pci.rel -CLEANFILES += pci.rel +noinst_PROGRAMS += pci.rel pci_rel_SOURCES = pci/pci.c pci/pci_interface.c pci/detect_host_bridge.c \ pci/pcifinddevice.c pci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pci_g.rel -CLEANFILES += pci_g.rel -pci_g_rel_SOURCES = $(pci_rel_SOURCES) -pci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pci$(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_init.c irq/GT64260Int.c irq/irq.c \ ../../powerpc/shared/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 - ### nodist_include_HEADERS += ../../shared/tod.h -EXTRA_PROGRAMS += tod.rel -CLEANFILES += tod.rel +noinst_PROGRAMS += tod.rel tod_rel_SOURCES = ../../shared/tod.c tod/todcfg.c tod_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += tod_g.rel -CLEANFILES += tod_g.rel -tod_g_rel_SOURCES = $(tod_rel_SOURCES) -tod_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -tod_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += tod$(LIB_VARIANT).rel - ## include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h \ vectors/bspException.h -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors_init.c \ vectors/exceptionhandler.c ../../powerpc/shared/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 - ## include_bsp_HEADERS += GT64260/bspMvme5500.h GT64260/gtreg.h \ GT64260/GT64260TWSI.h GT64260/VPD.h -EXTRA_PROGRAMS += GT64260.rel -CLEANFILES += GT64260.rel +noinst_PROGRAMS += GT64260.rel GT64260_rel_SOURCES = GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c GT64260_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) GT64260_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += GT64260_g.rel -CLEANFILES += GT64260_g.rel -GT64260_g_rel_SOURCES = $(GT64260_rel_SOURCES) -GT64260_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -GT64260_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += GT64260$(LIB_VARIANT).rel - ## if HAS_NETWORKING include_bsp_HEADERS += network/GT64260eth.h network/GT64260ethreg.h network_CPPFLAGS = -D_KERNEL -EXTRA_PROGRAMS += network.rel -CLEANFILES += network.rel +noinst_PROGRAMS += network.rel network_rel_SOURCES = network/GT64260eth.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 ## include_bsp_HEADERS += vme/VME.h vme/VMEConfig.h include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h -EXTRA_PROGRAMS += vme.rel -CLEANFILES += vme.rel +noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c vme/vmeconfig.c vme_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vme_g.rel -CLEANFILES += vme_g.rel -vme_g_rel_SOURCES = $(vme_rel_SOURCES) -vme_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vme_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vme$(LIB_VARIANT).rel - ## 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) -EXTRA_PROGRAMS += mvme5500start.$(OBJEXT) -CLEANFILES += mvme5500start.$(OBJEXT) +noinst_PROGRAMS += mvme5500start.$(OBJEXT) mvme5500start___OBJEXT__SOURCES = start/preload.S start/start.S mvme5500start___OBJEXT__CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += mvme5500start_g.$(OBJEXT) -CLEANFILES += mvme5500start_g.$(OBJEXT) -mvme5500start_g___OBJEXT__SOURCES = $(mvme5500start___OBJEXT__SOURCES) -mvme5500start_g___OBJEXT__CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -mvme5500start_g___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS) - -project_lib_DATA += mvme5500start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += mvme5500start.$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -343,16 +245,16 @@ $(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(P $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h -$(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)/mvme5500start$(LIB_VARIANT).$(OBJEXT): mvme5500start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/mvme5500start.$(OBJEXT): mvme5500start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start.$(OBJEXT) -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/mvme5500/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am index f833dcbeca..0008a7fe6c 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am @@ -4,33 +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 = ../pclock$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ - ../pci$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \ - ../tod$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel \ - ../GT64260$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../pclock.rel ../console.rel ../irq.rel ../pci.rel \ + ../startup.rel ../tod.rel ../vectors.rel ../GT64260.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.rel endif -___libbsp_a_LIBADD += ../vme$(LIB_VARIANT).rel -___libbsp_a_LIBADD += \ - ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/cache$(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 - -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 += ../vme.rel +___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/cache.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 include $(top_srcdir)/../../../../automake/local.am |