1 files changed, 26 insertions, 22 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am
index 0777710acc..ebad7f5db0 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am
@@ -22,37 +22,38 @@ include_bspdir = $(includedir)/bsp
 dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
-    ../../shared/bsplibc.c ../../powerpc/shared/startup/sbrk.c \
-    ../../shared/bspclean.c ../../shared/gnatinstallhandler.c \
-    ../../powerpc/shared/startup/pgtbl_setup.c \
-    ../../powerpc/shared/startup/pgtbl_activate.c \
-    ../../powerpc/shared/showbats.c
+    ../../shared/bspclean.c ../../shared/bsplibc.c \
+    ../../shared/sbrk.c \
+    ../../shared/gnatinstallhandler.c \
+    ../../powerpc/shared/showbats.c  \
+    ../../shared/bsppost.c ../../shared/bsppredriverhook.c 
 
-pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c
 
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \
-    ../../powerpc/shared/motorola/motorola.h \
-    ../../powerpc/shared/residual/residual.h \
-    ../../powerpc/shared/residual/pnp.h \
-    ../../powerpc/shared/console/consoleIo.h console/rsPMCQ1.h
+pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c
 console_SOURCES = console/console.c console/ns16550cfg.c \
     console/mc68360_scc.c console/rsPMCQ1.c console/alloc360.c \
     console/init68360.c
 
-include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
-openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \
-    ../../powerpc/shared/openpic/openpic.c
+include_bsp_HEADERS = ../../powerpc/shared/pci/pci.h \
+    ../../powerpc/shared/motorola/motorola.h \
+     ../../powerpc/shared/residual/residual.h \
+    ../../powerpc/shared/residual/pnp.h \
+    ../../powerpc/shared/console/consoleIo.h console/rsPMCQ1.h
 
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
 pci_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \
-    ../../powerpc/shared/pci/pcifinddevice.c
+        ../../powerpc/shared/pci/pcifinddevice.c
 
-include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \
+include_bsp_HEADERS += irq/irq.h \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h
-irq_SOURCES = irq/irq_init.c irq/openpic_xxx_irq.c ../../powerpc/shared/irq/i8259.c 
+
+irq_SOURCES =  irq/irq.h  irq/irq_init.c irq/openpic_xxx_irq.c \
+    ../../powerpc/shared/irq/i8259.c 
+    
+include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
+
+openpic_SOURCES = ../../powerpc/shared/openpic/openpic.c
 
 include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
     vme/VMEConfig.h \
@@ -64,7 +65,7 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
 
 vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \
     ../../shared/vmeUniverse/bspVmeDmaList.c \
-    ../shared/vme/vmeconfig.c \
+    vme/vmeconfig.c \
     ../shared/vme/vme_universe.c \
     ../../shared/vmeUniverse/vme_am_defs.h
 
@@ -78,9 +79,12 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
+EXTRA_DIST += README
+
 noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \
-    $(openpic_SOURCES) $(pci_SOURCES) $(irq_SOURCES) $(vme_SOURCES)
+libbsp_a_SOURCES =  $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \
+    $(pci_SOURCES) $(vectors_SOURCES) $(startup_SOURCES) \
+    $(openpic_SOURCES) $(vme_SOURCES) 
 
 libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \