From 69537ca9eccfa12142dea588fa34b70a6d220705 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 12 Jan 2000 16:38:56 +0000 Subject: Patch rtems-rc-20000104-16.diff from Ralf Corsepius that converts the libbsp/i386 subdirectory to full automake. --- c/src/lib/libbsp/i386/pc386/start/Makefile.am | 48 +++++++++++++++++ c/src/lib/libbsp/i386/pc386/start/Makefile.in | 77 --------------------------- c/src/lib/libbsp/i386/pc386/start/start16.S | 3 -- 3 files changed, 48 insertions(+), 80 deletions(-) create mode 100644 c/src/lib/libbsp/i386/pc386/start/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/pc386/start/Makefile.in (limited to 'c/src/lib/libbsp/i386/pc386/start') diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am new file mode 100644 index 0000000000..32ef8a28df --- /dev/null +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -0,0 +1,48 @@ +# +# $Id$ +# + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGMS = ${ARCH}/start.o ${ARCH}/start16.bin + +# Assembly source names, if any, go here -- minus the .S +S_FILES = start16.S start.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +if RTEMS_GAS_CODE16 +AM_CPPFLAGS += -DNEW_GAS +endif + +LINKCMDS = $(top_srcdir)/startup/linkcmds + +${ARCH}/start16.o: start16.S + ${COMPILE.S} $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $< + +${ARCH}/start16.bin: ${ARCH}/start16.o + $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \ + --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o + $(OBJCOPY) -O binary $(basename $@).obj $@ + +$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: ${ARCH}/start16.bin + $(INSTALL_DATA) $< $@ + +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin \ +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o + +all-local: $(ARCH) $(TMPINSTALL_FILES) + +EXTRA_DIST = start.S start16.S + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.in b/c/src/lib/libbsp/i386/pc386/start/Makefile.in deleted file mode 100644 index 4fbe83b4c8..0000000000 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.in +++ /dev/null @@ -1,77 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = start - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -PGMS = ${ARCH}/start.o ${ARCH}/start16.bin - -# C source names, if any, go here -- minus the .c -C_PIECES = -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_FILES = - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = start16 start -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(H_FILES) $(S_FILES) -OBJS = $(C_O_FILES) $(S_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# -# (OPTIONAL) Add local stuff here using += -# - -@RTEMS_GAS_CODE16_TRUE@CPPFLAGS += -DNEW_GAS -CFLAGS += - -LD_PATHS += -LD_LIBS += -LDFLAGS += - -# -# Add your list of files to delete here. The config files -# already know how to delete some stuff, so you may want -# to just run 'make clean' first to see what gets missed. -# 'make clobber' already includes 'make clean' -# - -CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += - -all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) - $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) - -LINKCMDS = $(srcdir)/../startup/linkcmds - -${ARCH}/start16.o: start16.S - ${COMPILE.S} -DHEADERADDR=$(HEADERADDR) -o $@ $< - -${ARCH}/start16.bin: ${ARCH}/start16.o - $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \ - --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o - $(OBJCOPY) -O binary $(basename $@).obj $@ - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/start/start16.S b/c/src/lib/libbsp/i386/pc386/start/start16.S index 730bb60265..5d80c28c72 100644 --- a/c/src/lib/libbsp/i386/pc386/start/start16.S +++ b/c/src/lib/libbsp/i386/pc386/start/start16.S @@ -16,9 +16,6 @@ | | This file is provided "AS IS" without warranty of any kind, either | expressed or implied. -+--------------------------------------------------------------------------+ -| This code is partly based on (from the Linux source tree): -| video.S - Copyright (C) 1995, 1996 Martin Mares +--------------------------------------------------------------------------*/ -- cgit v1.2.3