2 files changed, 18 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
index ec9fccfbf4..8a8dd2c93d 100644
--- a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -9,36 +9,34 @@ VPATH = @srcdir@:@srcdir@/../../shared/irq
 PGM = $(ARCH)/irq.rel
 
 C_FILES = irq.c irq_init.c bsp_irq_init.c
-S_FILES = irq_asm.S bsp_irq_asm.S
-H_FILES = irq.h
-
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
-
-irq_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
 
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
+S_FILES = irq_asm.S bsp_irq_asm.S
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
+H_FILES = irq.h
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
+OBJS = $(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-$(PGM): $(startup_rel_OBJECTS)
+AM_CPPFLAGS += -I$(srcdir)
+
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(PREINSTALL_FILES) $(ARCH) $(irq_rel_OBJECTS) $(PGM)
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = irq.c bsp_irq_init.c bsp_irq_asm.S
+EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c irq.h
 
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/irq.c b/c/src/lib/libbsp/arm/vegaplus/irq/irq.c
index 0f90bb1d47..f6efc284ed 100644
--- a/c/src/lib/libbsp/arm/vegaplus/irq/irq.c
+++ b/c/src/lib/libbsp/arm/vegaplus/irq/irq.c
@@ -39,6 +39,7 @@ static int isValidInterrupt(int irq)
 int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 {
     rtems_irq_hdl *HdlTable;
+    rtems_interrupt_level level;
     
     if (!isValidInterrupt(irq->name)) {
       return 0;
@@ -46,7 +47,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Check if default handler is actually connected. If not issue an error.
      */
-    HdlTable = VECTOR_TABLE;
+    HdlTable = (rtems_irq_hdl *) VECTOR_TABLE;
     if (*(HdlTable + irq->name) != default_int_handler) {
       return 0;
     }
@@ -86,6 +87,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 {
     rtems_irq_hdl *HdlTable;
+    rtems_interrupt_level level;
   
     if (!isValidInterrupt(irq->name)) {
       return 0;
@@ -93,7 +95,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Check if the handler is actually connected. If not issue an error.
      */
-    HdlTable = VECTOR_TABLE;
+    HdlTable = (rtems_irq_hdl *) VECTOR_TABLE;
     if (*(HdlTable + irq->name) != irq->hdl) {
       return 0;
     }