From b285860989cc2e4002e32005ce7e9005744bffa5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 31 Aug 1998 23:03:45 +0000 Subject: Patch from Eric Valette : Eric> NB : there is still a bug on PC386 serial line : exit does not Eric> flush the remaining output queue. As this is not a bug in the Eric> driver itself but somewhere in PC386 initialization/termios Eric> relationship it will be part of another patch. Eric> NB2 : As Emmanuel excerced the exception hanlder code, while Eric> porting the SMC driver to the new BSD stack, we found a bug Eric> in the exception handler : it shall not delete the current Eric> thread in case we are running at interrupt level. This will Eric> be part of another patch... So here is the patch. This patch fixes the two problems mentionned above + it use vpath mechanism intead of copying the irq related files in the right directory. This avoid to compile them each time and is more homogenous with other Makefiles. --- c/src/lib/libbsp/i386/pc386/startup/Makefile.in | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'c/src/lib/libbsp/i386/pc386/startup/Makefile.in') diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.in b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in index 3ac6b77792..b59323c6ff 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in @@ -4,17 +4,14 @@ @SET_MAKE@ srcdir = @srcdir@ -VPATH = @srcdir@:@srcdir@/../../../shared +VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ PGM=${ARCH}/startup.rel -IMPORT_SRC=$(srcdir)/../../shared/irq/irq.c \ - $(srcdir)/../../shared/irq/irq_init.c $(srcdir)/../../shared/irq/irq_asm.s - # C source names, if any, go here -- minus the .c -C_PIECES=bspclean bsplibc bsppost bspstart exit irq irq_init main sbrk +C_PIECES=bsplibc bsppost bspstart exit irq irq_init main sbrk C_FILES=$(C_PIECES:%=%.c) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) @@ -53,12 +50,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -preinstall: - ${CP} ${IMPORT_SRC} . - ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} preinstall $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) $(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -- cgit v1.2.3