From 71cbb666a432fccaaf351493465edca9fad3f719 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 3 Jan 2005 04:16:13 +0000 Subject: 2005-01-02 Ralf Corsepius * Makefile.am, wrapup/Makefile.am: Remove build-variant support. --- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 4 + c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 131 ++++----------------- .../lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 20 +--- 3 files changed, 29 insertions(+), 126 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 7f54044021..e82138c9bf 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index ff12041d26..c381c436a5 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -15,39 +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 = nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h include_HEADERS += include/tod.h include_HEADERS += include/nvram.h include/pci.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) dist_project_lib_DATA += startup/linkcmds -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += 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 +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/console.c console/i8042vga.c \ console/i8042vga.h console/i8042.c console/i8042_p.h \ console/ns16550cfg.c console/ns16550cfg.h console/z85c30cfg.c \ @@ -55,45 +45,18 @@ console_rel_SOURCES = console/console.c console/i8042vga.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 += pci.rel -CLEANFILES += pci.rel +noinst_PROGRAMS += pci.rel pci_rel_SOURCES = pci/pci.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 - -EXTRA_PROGRAMS += nvram.rel -CLEANFILES += nvram.rel +noinst_PROGRAMS += nvram.rel nvram_rel_SOURCES = nvram/nvram.c nvram/ds1385.h nvram/mk48t18.h \ nvram/prepnvr.h nvram/stk11c68.h nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += nvram_g.rel -CLEANFILES += nvram_g.rel -nvram_g_rel_SOURCES = $(nvram_rel_SOURCES) -nvram_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -nvram_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += nvram$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/bspstart.c startup/bspclean.c \ ../../shared/sbrk.c startup/setvec.c startup/spurious.c \ startup/genpvec.c startup/swap.c ../../shared/main.c \ @@ -102,89 +65,35 @@ startup_rel_SOURCES = startup/bspstart.c startup/bspclean.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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += 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_PROGRAMS += tod.rel -CLEANFILES += tod.rel +noinst_PROGRAMS += tod.rel tod_rel_SOURCES = tod/tod.c tod/cmos.h 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 - -EXTRA_PROGRAMS += universe.rel -CLEANFILES += universe.rel +noinst_PROGRAMS += universe.rel universe_rel_SOURCES = universe/universe.c universe_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) universe_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += universe_g.rel -CLEANFILES += universe_g.rel -universe_g_rel_SOURCES = $(universe_rel_SOURCES) -universe_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -universe_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += universe$(LIB_VARIANT).rel - EXTRA_DIST += vectors/README vectors/align_h.S -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = 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_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += network.rel -CLEANFILES += network.rel +noinst_PROGRAMS += network.rel network_rel_SOURCES = network/amd79c970.c network/amd79c970.h 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 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -237,16 +146,16 @@ $(PROJECT_INCLUDE)/pci.h: include/pci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.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)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds -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/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index f2483b4327..c513644a7f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -4,24 +4,14 @@ 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 ../clock$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../timer$(LIB_VARIANT).rel \ - ../tod$(LIB_VARIANT).rel ../nvram$(LIB_VARIANT).rel \ - ../universe$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \ - ../vectors$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../timer.rel \ + ../tod.rel ../nvram.rel ../universe.rel ../pci.rel ../vectors.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.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 -- cgit v1.2.3