From a5417074834a949c8eb7b5f6d115df526160c790 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:42:23 +0000 Subject: 2000-09-04 Ralf Corsepius * 3c509/Makefile.am, clock/Makefile.am, console/Makefile.am, ne2000/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wd8003/Makefile.am, wrapup/Makefile.am: Include compile.am --- c/src/lib/libbsp/i386/pc386/3c509/Makefile.am | 1 + c/src/lib/libbsp/i386/pc386/ChangeLog | 7 +++++++ c/src/lib/libbsp/i386/pc386/clock/Makefile.am | 1 + c/src/lib/libbsp/i386/pc386/console/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am | 1 + c/src/lib/libbsp/i386/pc386/start/Makefile.am | 1 + c/src/lib/libbsp/i386/pc386/startup/Makefile.am | 1 + c/src/lib/libbsp/i386/pc386/timer/Makefile.am | 1 + c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am | 1 + c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am | 3 ++- 10 files changed, 18 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am index 6c741eea90..877739011a 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am @@ -12,6 +12,7 @@ X3c509_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = 3c509.h elink.h include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index e5956611b9..ee78fdce78 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,10 @@ +2000-09-04 Ralf Corsepius + + * 3c509/Makefile.am, clock/Makefile.am, console/Makefile.am, + ne2000/Makefile.am, start/Makefile.am, startup/Makefile.am, + timer/Makefile.am, wd8003/Makefile.am, wrapup/Makefile.am: Include + compile.am + 2000-08-30 Joel Sherrill * console/keyboard.h: Changed numerous routines from extern inline diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am index 131b243ca6..bf99f8a6a9 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am @@ -10,6 +10,7 @@ C_FILES = ckinit.c rtc.c clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am index d95fa73f0a..1c6fcfb899 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.am @@ -17,10 +17,10 @@ S_FILES = videoAsm.S console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ $(RTEMS_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/%.h) # diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am index ef41a484d9..c8c1fd73ad 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am @@ -10,6 +10,7 @@ C_FILES = ne2000.c ne2000_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index 2d530c6695..e051a3c8ff 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -12,6 +12,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am index 76e66dd9a7..b9f2a0448e 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am @@ -20,6 +20,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) startup_rel_OBJECTS = $(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 # diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am index df08f6e87d..2d2c4a42fc 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am @@ -11,6 +11,7 @@ S_FILES = timerisr.S timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am index 24abfa1c65..f6925a8744 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am @@ -10,6 +10,7 @@ C_FILES = wd8003.c wd8003_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am index 0d459850cb..5a3a2e0380 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am @@ -14,10 +14,11 @@ BSP_FILES = startup clock console timer $(NETWORK) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.o) + $(wildcard ../../../../libcpu/i386/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # -- cgit v1.2.3