diff options
| -rw-r--r-- | gnu/lib/Makefile | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/gdb/Makefile.in | 20 | ||||
| -rw-r--r-- | include/Makefile | 5 |
4 files changed, 18 insertions, 16 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 66cb4db76f1..3ad62edb3fc 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.7 2000/12/11 02:22:53 provos Exp $ -# $NetBSD: Makefile,v 1.7 1995/04/23 07:50:21 cgd Exp $ +# $OpenBSD: Makefile,v 1.8 2001/03/18 17:39:55 millert Exp $ -SUBDIR+=../egcs +SUBDIR+=../egcs libreadline .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper index 823bd03f9a7..41e3a918d01 100644 --- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.42 2001/01/16 20:22:31 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.43 2001/03/18 17:39:55 millert Exp $ NEW_BINUTILS=alpha mips powerpc hppa @@ -17,7 +17,7 @@ MANDIR=${PREFIX}/share/man/cat MAN= binutils/objdump.1 .if ${MACHINE_ARCH} != "unknown" -SUBDIRS+= gdb mmalloc readline +SUBDIRS+= gdb mmalloc MAN+= gdb/gdb.1 ALL_X11_MODULES+=all-gdb INSTALL_X11_MODULES+=install-gdb diff --git a/gnu/usr.bin/binutils/gdb/Makefile.in b/gnu/usr.bin/binutils/gdb/Makefile.in index 740b2912a8d..c1f1a0abcb4 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile.in +++ b/gnu/usr.bin/binutils/gdb/Makefile.in @@ -109,10 +109,12 @@ BFD_SRC = $(srcdir)/$(BFD_DIR) BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) # Where is the READLINE library? Typically in ../readline. -READLINE_DIR = ../readline -READLINE = $(READLINE_DIR)/libreadline.a -READLINE_SRC = $(srcdir)/$(READLINE_DIR) -READLINE_CFLAGS = -I$(READLINE_SRC) +#READLINE_DIR = ../readline +#READLINE = $(READLINE_DIR)/libreadline.a +#READLINE_SRC = $(srcdir)/$(READLINE_DIR) +#READLINE_CFLAGS = -I$(READLINE_SRC) +READLINE = -lreadline +READLINE_CFLAGS = -I$(DESTDIR)/usr/include/readline # Opcodes currently live in one of two places. Either they are in the # opcode library, typically ../opcodes, or they are in a header file @@ -386,11 +388,11 @@ dis-asm_h = $(INCLUDE_DIR)/dis-asm.h dcache_h = dcache.h remote_utils_h = $(dcache_h) serial.h target.h remote-utils.h remote-sim.h -readline_headers = \ - $(READLINE_SRC)/chardefs.h \ - $(READLINE_SRC)/history.h \ - $(READLINE_SRC)/keymaps.h \ - $(READLINE_SRC)/readline.h +#readline_headers = \ +# $(READLINE_SRC)/chardefs.h \ +# $(READLINE_SRC)/history.h \ +# $(READLINE_SRC)/keymaps.h \ +# $(READLINE_SRC)/readline.h udiheaders = \ $(srcdir)/29k-share/udi/udiproc.h \ diff --git a/include/Makefile b/include/Makefile index f3142a26573..c59c348a5b8 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.89 2001/03/02 13:27:04 espie Exp $ +# $OpenBSD: Makefile,v 1.90 2001/03/18 17:39:54 millert Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -45,7 +45,8 @@ RDIRS= ../lib/libc_r ../lib/libcom_err ../lib/libcompat ../lib/libcurses \ ../lib/libcurses++ ../lib/libform ../lib/libmenu ../lib/libocurses \ ../lib/libossaudio ../lib/libpanel ../lib/librpcsvc ../lib/libskey \ ../lib/libedit ../lib/libpcap ../lib/libutil ../lib/libwrap \ - ../lib/libz ../lib/libkeynote ../sys/arch/${MACHINE} + ../lib/libz ../lib/libkeynote ../gnu/lib/libreadline \ + ../sys/arch/${MACHINE} # Places using Makefile that needs a prerequisite target met before includes PRDIRS= |