summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-07 12:26:57 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-07 12:26:57 +0000
commitb3c7b2d808a670c856879711fb7b08394b4dab28 (patch)
tree37864048057f93f3412c4f4d22a1d9e3b2c60247 /c
parent2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-b3c7b2d808a670c856879711fb7b08394b4dab28.tar.bz2
2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Remove. * Makefile.am: Merge-in start/Makefile.am. * configure.ac: Reflect changes above.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/i386/i386ex/ChangeLog6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/Makefile.am22
-rw-r--r--c/src/lib/libbsp/i386/i386ex/configure.ac1
-rw-r--r--c/src/lib/libbsp/i386/i386ex/start/Makefile.am34
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog6
-rw-r--r--c/src/lib/libbsp/i386/pc386/Makefile.am41
-rw-r--r--c/src/lib/libbsp/i386/pc386/configure.ac1
-rw-r--r--c/src/lib/libbsp/i386/pc386/start/Makefile.am49
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/ChangeLog6
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/Makefile.am23
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/configure.ac1
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am34
12 files changed, 92 insertions, 132 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index d91307ec5d..2f7ac54c30 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * start/Makefile.am: Remove.
+ * Makefile.am: Merge-in start/Makefile.am.
+ * configure.ac: Reflect changes above.
+
2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Eliminate $(LIB).
diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am
index b9f6e7b5ab..7c0207ffd2 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am
@@ -4,19 +4,33 @@
ACLOCAL_AMFLAGS = -I ../../../../aclocal
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../bsp.am
+
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = . start startup clock console timer network wrapup
-
-include $(top_srcdir)/../../bsp.am
+SUBDIRS = . startup clock console timer network wrapup
include_HEADERS += include/coverhd.h
-all-local: $(PREINSTALL_FILES)
+noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc
+S_FILES = start/start.S
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
+ $(CCASCOMPILE) -DASM -o $@ -c $<
+
+project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/i386ex/configure.ac b/c/src/lib/libbsp/i386/i386ex/configure.ac
index f56f90be2a..ad59109f2f 100644
--- a/c/src/lib/libbsp/i386/i386ex/configure.ac
+++ b/c/src/lib/libbsp/i386/i386ex/configure.ac
@@ -27,7 +27,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
-start/Makefile
startup/Makefile
timer/Makefile
network/Makefile
diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am
deleted file mode 100644
index 70c5fcb72a..0000000000
--- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-##
-## $Id$
-##
-
-S_FILES = start.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-noinst_HEADERS = 80386ex.h 80386ex.inc macros.inc
-
-OBJS = $(S_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-include $(top_srcdir)/../../bspstart.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = start.S
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(mkdir_p) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index e9faad35b7..a972514adb 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * start/Makefile.am: Remove.
+ * Makefile.am: Merge-in start/Makefile.am.
+ * configure.ac: Reflect changes above.
+
2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Eliminate $(LIB).
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 645059cc89..86b1149ac3 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -4,13 +4,16 @@
ACLOCAL_AMFLAGS = -I ../../../../aclocal
+# FIXME: We must not include *.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../bsp.am
+
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = . tools start startup clock console timer ne2000 wd8003 3c509 ide \
+SUBDIRS = . tools startup clock console timer ne2000 wd8003 3c509 ide \
wrapup
-include $(top_srcdir)/../../bsp.am
-
# This driver needs to be reworked for the BSD stack.
# We only install wd80x3.h if HAS_NETWORKING was defined
if HAS_NETWORKING
@@ -20,10 +23,32 @@ endif
include_HEADERS += include/crt.h
nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
-all-local: $(PREINSTALL_FILES)
+S_FILES = start/start.S
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
+ ${CCASCOMPILE} -DASM -o $@ -c $<
+
+project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
+
+S_FILES += start/start16.S
+$(ARCH)/start16.$(OBJEXT): start/start16.S $(ARCH)/$(dirstamp)
+ $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $<
+
+$(ARCH)/start16$(LIB_VARIANT)-elf32.$(OBJEXT): $(ARCH)/start16.$(OBJEXT) $(ARCH)/$(dirstamp)
+ $(LD) -N -T $(top_srcdir)/startup/linkcmds -Ttext $(START16ADDR) -e start16 -nostdlib \
+ --oformat=elf32-i386 \
+ -o $@ $<
+
+$(ARCH)/start16$(LIB_VARIANT).bin: $(ARCH)/start16$(LIB_VARIANT)-elf32.$(OBJEXT)
+ $(OBJCOPY) -O binary $< $@
+
+project_lib_DATA += $(ARCH)/start16$(LIB_VARIANT).bin
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
EXTRA_DIST = HOWTO README.dec21140 STATUS times_i486dx times_p5
+TMPINSTALL_FILES =
+
if HAS_NETWORKING
$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h
@@ -38,5 +63,13 @@ $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PRO
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
+$(PROJECT_LIB)/start16$(LIB_VARIANT).bin: $(ARCH)/start16$(LIB_VARIANT).bin $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
+TMPINSTALL_FILES += $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
+
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index d78011058a..044428c8d8 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -30,7 +30,6 @@ AC_SUBST(RTEMS_BSP)
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
-start/Makefile
startup/Makefile
timer/Makefile
3c509/Makefile
diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am
deleted file mode 100644
index f8c53168db..0000000000
--- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-## $Id$
-##
-
-S_FILES = start16.S start.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-include $(top_srcdir)/../../bspstart.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-LINKCMDS = $(top_srcdir)/startup/linkcmds
-
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
-project_lib_DATA += $(ARCH)/start16$(LIB_VARIANT).bin
-
-$(ARCH)/start16.$(OBJEXT): start16.S $(ARCH)/$(dirstamp)
- $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $<
-
-$(ARCH)/start16$(LIB_VARIANT).bin: $(ARCH)/start16.$(OBJEXT) $(ARCH)/$(dirstamp)
- $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \
- --oformat=elf32-i386 \
- -o $(basename $@)-elf32.$(OBJEXT) $(basename $@).$(OBJEXT)
- $(OBJCOPY) -O binary $(basename $@)-elf32.$(OBJEXT) $@
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = start.S start16.S
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(mkdir_p) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-
-$(PROJECT_LIB)/start16$(LIB_VARIANT).bin: $(ARCH)/start16$(LIB_VARIANT).bin $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
-TMPINSTALL_FILES += $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 0a36a82e79..2144eef356 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * start/Makefile.am: Remove.
+ * Makefile.am: Merge-in start/Makefile.am.
+ * configure.ac: Reflect changes above.
+
2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Eliminate $(LIB).
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
index d6939dd825..1203c6d136 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
@@ -4,11 +4,12 @@
ACLOCAL_AMFLAGS = -I ../../../../aclocal
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../bsp.am
+
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = . tools start startup clock console timer network wrapup
-
-include $(top_srcdir)/../../bsp.am
+SUBDIRS = . tools startup clock console timer network wrapup
if HAS_NETWORKING
include_HEADERS += include/wd80x3.h
@@ -16,7 +17,17 @@ endif
include_HEADERS += include/coverhd.h
-all-local: $(PREINSTALL_FILES)
+noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc \
+ start/ts_1325.inc
+S_FILES = start/start.S
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
+ $(CCASCOMPILE) -DASM -o $@ -c $<
+
+project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
if HAS_NETWORKING
$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
@@ -28,5 +39,9 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/ts_386ex/configure.ac b/c/src/lib/libbsp/i386/ts_386ex/configure.ac
index 6b85460e53..ab5eb88d48 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/configure.ac
+++ b/c/src/lib/libbsp/i386/ts_386ex/configure.ac
@@ -43,7 +43,6 @@ RTEMS_BSPOPTS_HELP([UARTDEBUG],
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
-start/Makefile
startup/Makefile
timer/Makefile
network/Makefile
diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am
deleted file mode 100644
index c5da66c111..0000000000
--- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-##
-## $Id$
-##
-
-S_FILES = start.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(S_O_FILES)
-
-noinst_FILES = 80386ex.h
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-include $(top_srcdir)/../../bspstart.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = 80386ex.h 80386ex.inc macros.inc start.S ts_1325.inc
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(mkdir_p) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-
-include $(top_srcdir)/../../../../automake/local.am