Index: gnu/lib/libreadline/Makefile =================================================================== --- gnu/lib/libreadline/Makefile (révision 253838) +++ gnu/lib/libreadline/Makefile (copie de travail) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR = history readline +SUBDIR = readline .include Index: gnu/lib/libreadline/history/Makefile =================================================================== --- gnu/lib/libreadline/history/Makefile (révision 253838) +++ gnu/lib/libreadline/history/Makefile (copie de travail) @@ -1,15 +0,0 @@ -# $FreeBSD$ - -SUBDIR= doc - -LIB= history -MAN= rlhistory.3 - -SRCS= $(HISTSRC) xmalloc.c - -rlhistory.3: doc/history.3 - cp -f ${.ALLSRC} ${.TARGET} - -CLEANFILES+= rlhistory.3 - -.include Index: gnu/lib/libreadline/history/doc/Makefile =================================================================== --- gnu/lib/libreadline/history/doc/Makefile (révision 253838) +++ gnu/lib/libreadline/history/doc/Makefile (copie de travail) @@ -1,12 +0,0 @@ -# $FreeBSD$ - -SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc - -INFO = history - -INFOSECTION= "Programming & development tools." -INFOENTRY_history= "* History: (history). The GNU History library." - -history.info: history.texi hstech.texi hsuser.texi version.texi fdl.texi - -.include Index: gnu/lib/libreadline/readline/Makefile =================================================================== --- gnu/lib/libreadline/readline/Makefile (révision 253838) +++ gnu/lib/libreadline/readline/Makefile (copie de travail) @@ -1,10 +1,7 @@ # $FreeBSD$ -SUBDIR= doc - LIB= readline -MAN= doc/readline.3 -SHLIBDIR?= /lib +NTERNALLIB= TILDESRC= tilde.c SRCS= readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \ @@ -11,17 +8,15 @@ rltty.c complete.c bind.c isearch.c display.c signals.c \ util.c kill.c undo.c macro.c input.c callback.c terminal.c \ text.c nls.c misc.c compat.c xmalloc.c $(HISTSRC) $(TILDESRC) +CFLAGS+= -I${.OBJDIR}/.. INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h - -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap - -INCSDIR=${INCLUDEDIR}/readline - -.for hdr in ${INSTALLED_HEADERS} -INCS+= ${SRCDIR}/${hdr} +.for _h in ${INSTALLED_HEADERS} +CLEANFILES+= ${_h} +DPSRCS+= ${.OBJDIR}/${_h} +${.OBJDIR}/${_h}: ${_h} + ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor .include Index: gnu/lib/libreadline/readline/doc/Makefile =================================================================== --- gnu/lib/libreadline/readline/doc/Makefile (révision 253838) +++ gnu/lib/libreadline/readline/doc/Makefile (copie de travail) @@ -1,20 +0,0 @@ -# $FreeBSD$ - -SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc - -INFO = readline rluserman - -INFOSECTION= "Programming & development tools." -INFOENTRY_readline= "* Readline: (readline). The GNU Readline library" -INFOENTRY_rluserman= "* Readline: (readline). The GNU readline library API" - -CLEANFILES += readline.texi - -readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi - -readline.texi: rlman.texi - cp -f ${SRCDIR}/rlman.texi ${.TARGET} - -rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi - -.include Index: gnu/usr.bin/gdb/Makefile.inc =================================================================== --- gnu/usr.bin/gdb/Makefile.inc (révision 253838) +++ gnu/usr.bin/gdb/Makefile.inc (copie de travail) @@ -15,6 +15,7 @@ OBJ_ROOT= ${.OBJDIR}/../.. OBJ_BU= ${OBJ_ROOT}/binutils OBJ_GDB= ${OBJ_ROOT}/gdb +OBJ_RL = ${OBJ_ROOT}/../lib/libreadline/readline # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... @@ -46,6 +47,7 @@ CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_BU}/bfd +CFLAGS+= -I${OBJ_RL}/.. GENSRCS+= nm.h tm.h Index: gnu/usr.bin/gdb/gdb/Makefile =================================================================== --- gnu/usr.bin/gdb/gdb/Makefile (révision 253838) +++ gnu/usr.bin/gdb/gdb/Makefile (copie de travail) @@ -5,14 +5,14 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a -GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a +GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a ${OBJ_RL}/libreadline.a # libthread_db.so calls back into gdb for the proc services. Make all the # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBTERMCAP} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm -ltermcap -lgnuregex .include CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Index: gnu/usr.bin/gdb/gdbtui/Makefile =================================================================== --- gnu/usr.bin/gdb/gdbtui/Makefile (révision 253838) +++ gnu/usr.bin/gdb/gdbtui/Makefile (copie de travail) @@ -6,13 +6,13 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a -GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a +GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a ${OBJ_RL}/libreadline.a # libthread_db.so calls back into gdb for the proc services. Make all the # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBTERMCAP} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm -ltermcap -lgnuregex .include Index: gnu/usr.bin/gdb/kgdb/Makefile =================================================================== --- gnu/usr.bin/gdb/kgdb/Makefile (révision 253838) +++ gnu/usr.bin/gdb/kgdb/Makefile (copie de travail) @@ -6,9 +6,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a -GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a +GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a ${OBJ_RL}/libreadline.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBTERMCAP} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lkvm -lm -ltermcap -lgnuregex .include