1 files changed, 24 insertions, 50 deletions
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 8ad15ed4b9..d2e18e4f26 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -134,56 +134,30 @@ mc9328mxl_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mc9328mxl_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-if s3c2400
-include_HEADERS = s3c24xx/include/s3c24xx.h s3c2400/include/s3c2400.h
-
-## s3c2400/clock
-noinst_PROGRAMS += s3c2400/clock.rel
-s3c2400_clock_rel_SOURCES = s3c2400/clock/clockdrv.c s3c2400/clock/support.c
-s3c2400_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-s3c2400_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## s3c2400/timer
-noinst_PROGRAMS += s3c2400/timer.rel
-s3c2400_timer_rel_SOURCES = s3c2400/timer/timer.c
-s3c2400_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-s3c2400_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## s3c2400/interrupt
-include_HEADERS += s3c2400/irq/irq.h
-
-noinst_PROGRAMS += s3c2400/irq.rel
-s3c2400_irq_rel_SOURCES = s3c24xx/irq/irq.c s3c24xx/irq/bsp_irq_init.c \
-    ../../libbsp/arm/shared/irq/irq_init.c s3c2400/irq/bsp_irq_asm.S \
-    s3c2400/irq/irq.h
-s3c2400_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-s3c2400_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-if s3c2410
-include_HEADERS = s3c24xx/include/s3c24xx.h s3c2410/include/s3c2410.h
-
-## s3c2410/clock
-noinst_PROGRAMS += s3c2410/clock.rel
-s3c2410_clock_rel_SOURCES = s3c24xx/clock/clockdrv.c s3c24xx/clock/support.c
-s3c2410_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-s3c2410_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## s3c2410/timer
-noinst_PROGRAMS += s3c2410/timer.rel
-s3c2410_timer_rel_SOURCES = s3c24xx/timer/timer.c
-s3c2410_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-s3c2410_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## s3c2410/interrupt
-include_HEADERS += s3c2410/irq/irq.h
-
-noinst_PROGRAMS += s3c2410/irq.rel
-s3c2410_irq_rel_SOURCES = s3c24xx/irq/irq.c s3c24xx/irq/bsp_irq_init.c \
-    ../../libbsp/arm/shared/irq/irq_init.c s3c2410/irq/bsp_irq_asm.S \
-    s3c2410/irq/irq.h
-s3c2410_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-s3c2410_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+if s3c24xx
+include_HEADERS = s3c24xx/include/s3c24xx.h s3c24xx/include/s3c2400.h s3c24xx/include/s3c2410.h
+
+## s3c24xx/clock
+noinst_PROGRAMS += s3c24xx/clock.rel
+s3c24xx_clock_rel_SOURCES = s3c24xx/clock/clockdrv.c s3c24xx/clock/support.c
+s3c24xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
+s3c24xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## s3c24xx/timer
+noinst_PROGRAMS += s3c24xx/timer.rel
+s3c24xx_timer_rel_SOURCES = s3c24xx/timer/timer.c
+s3c24xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
+s3c24xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## s3c24xx/interrupt
+include_HEADERS += s3c24xx/irq/irq.h
+
+noinst_PROGRAMS += s3c24xx/irq.rel
+s3c24xx_irq_rel_SOURCES = s3c24xx/irq/irq.c s3c24xx/irq/bsp_irq_init.c \
+    ../../libbsp/arm/shared/irq/irq_init.c s3c24xx/irq/bsp_irq_asm.S \
+    s3c24xx/irq/irq.h
+s3c24xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
+s3c24xx_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
 if lpc22xx