2005-10-17 Ralf Corsepius <ralf.corsepius@rtems.org>

* Makefile.am: Merge-in shared/Makefile.am.
	* configure.ac: Remove shared/Makefile.am.
	* ChangeLog: Merge-in shared/ChangeLog.

c/src/lib/libbsp/powerpc/Makefile.am

@@ -5,11 +5,62 @@
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
 ## Descend into the @RTEMS_BSP_FAMILY@ directory
-SUBDIRS = shared @RTEMS_BSP_FAMILY@
+SUBDIRS = @RTEMS_BSP_FAMILY@
 
 # FIXME: This does not work
 # DIST_SUBDIRS = @all_subdirs@ support/old_exception_processing \
 #    support/new_exception_processing
 
+# FIXME: Herein lies madness ;)
+
+## shared/include
+EXTRA_DIST = shared/include/nvram.h
+
+## shared/bootloader
+EXTRA_DIST += shared/bootloader/em86.c shared/bootloader/lib.c shared/bootloader/misc.c \
+    shared/bootloader/mm.c shared/bootloader/pci.c shared/bootloader/zlib.c
+EXTRA_DIST += shared/bootloader/bootldr.h shared/bootloader/zlib.h shared/bootloader/pci.h
+EXTRA_DIST += shared/bootloader/em86real.S shared/bootloader/exception.S \
+    shared/bootloader/head.S
+EXTRA_DIST += shared/bootloader/ppcboot.lds
+
+## shared/clock
+EXTRA_DIST += shared/clock/p_clock.c
+
+## shared/console
+EXTRA_DIST += shared/console/console.c shared/console/inch.c shared/console/polled_io.c \
+    shared/console/uart.c shared/console/reboot.c shared/console/console.inl
+
+## shared/motorola
+EXTRA_DIST += shared/motorola/motorola.c
+
+## shared/pci
+EXTRA_DIST += shared/pci/pci.c shared/pci/detect_raven_bridge.c shared/pci/pcifinddevice.c
+
+## shared/residual
+EXTRA_DIST += shared/residual/residual.c
+
+## shared/openpic
+EXTRA_DIST += shared/openpic/openpic.c
+
+## shared/irq
+EXTRA_DIST += shared/irq/i8259.c shared/irq/irq.c shared/irq/irq_init.c shared/irq/irq_asm.S
+
+## shared/start
+EXTRA_DIST += shared/start/start.S shared/start/rtems_crti.S
+
+## shared/startup
+EXTRA_DIST += shared/startup/bspstart.c shared/startup/pgtbl_setup.c \
+    shared/startup/pgtbl_activate.c
+
+## shared/tod
+EXTRA_DIST += shared/tod/todcfg.c
+
+## shared/vectors
+EXTRA_DIST += shared/vectors/vectors_init.c shared/vectors/vectors.S
+
+## shared/vme
+EXTRA_DIST += shared/vme/vmeconfig.c shared/vme/VMEConfig.h shared/vme/VME.h
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/libbsp/powerpc/configure.ac

@@ -17,10 +17,6 @@ RTEMS_PROJECT_ROOT
 
 RTEMS_CHECK_BSPDIR([$RTEMS_BSP_FAMILY])
 
-AM_CONDITIONAL(need_shared, test "$RTEMS_BSP_FAMILY" = "motorola_powerpc" \
-                         || test "$RTEMS_BSP_FAMILY" = "mvme5500")
-
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-shared/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT