diff options
author | bde <bde@FreeBSD.org> | 1997-04-07 16:52:53 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-04-07 16:52:53 +0000 |
commit | 7e4f8a55046682769028841829c1911fedf7bc9c (patch) | |
tree | f7fb75a51d69cb5f6048231df9c26cc834055687 /gnu/usr.bin/texinfo | |
parent | 8d6ed2803c758cc362bb65dbddcfcd873256b291 (diff) | |
download | FreeBSD-src-7e4f8a55046682769028841829c1911fedf7bc9c.zip FreeBSD-src-7e4f8a55046682769028841829c1911fedf7bc9c.tar.gz |
Fixed bugs involving paths:
- LDADD was wrong for non-uniform obj trees.
- DPADD was wrong for separate obj tres.
Cleaned up nearby messes, mostly ones invoving paths:
- -I../libtxi was useless.
- there were too many redefinitions and too many different names for the
same paths.
- use INTERNALLIB* to simplify libtxi/Makefile.
Diffstat (limited to 'gnu/usr.bin/texinfo')
-rw-r--r-- | gnu/usr.bin/texinfo/doc/Makefile | 14 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/info/Makefile | 24 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/install-info/Makefile | 26 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/libtxi/Makefile | 23 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/makeinfo/Makefile | 25 |
5 files changed, 36 insertions, 76 deletions
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile index aa03b75..3416ad3 100644 --- a/gnu/usr.bin/texinfo/doc/Makefile +++ b/gnu/usr.bin/texinfo/doc/Makefile @@ -1,13 +1,7 @@ -# -# $Id$ -# +# $Id$ -SRCTEXINFODIR= ${.CURDIR}/../../../../contrib/texinfo -SRCINFODIR= ${.CURDIR}/../../../../contrib/texinfo/info -SRCMAKEINFODIR= ${.CURDIR}/../../../../contrib/texinfo/makeinfo - -INFO= texinfo info info-stnd makeinfo - -.PATH: $(SRCTEXINFODIR) $(SRCINFODIR) $(SRCMAKEINFODIR) +INFO= texinfo info info-stnd makeinfo .include <bsd.info.mk> + +.PATH: ${TXIDIR} ${TXIDIR}/info ${TXIDIR}/makeinfo diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index 9edb4d2..2ba6f06 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -1,30 +1,22 @@ -# -# $id$ -# +# $Id$ -INFOSRCDIR= ${.CURDIR}/../../../../contrib/texinfo/info -TXIDIR= ${.CURDIR}/../../../../contrib/texinfo/libtxi -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a -BINDIR= /usr/bin +PROG= info -PROG= info - -SRCS+= dir.c display.c doc.c echo_area.c filesys.c info-utils.c info.c infodoc.c infomap.c +SRCS= dir.c display.c doc.c echo_area.c filesys.c info-utils.c info.c infodoc.c infomap.c SRCS+= m-x.c nodes.c search.c session.c signals.c terminal.c tilde.c window.c indices.c SRCS+= xmalloc.c nodemenu.c footnotes.c dribble.c variables.c gc.c man.c clib.c -# $(INFODIR) is defined in /usr/share/mk/bsd.own.mk CFLAGS+= -DHANDLE_MAN_PAGES -DNAMED_FUNCTIONS=1 CFLAGS+= -DDEFAULT_INFOPATH=\"${INFODIR}:/usr/local/info:.\" CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 CFLAGS+= -DHAVE_ALLOCA=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 CFLAGS+= -DHAVE_STRCHR=1 -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -CFLAGS+= -DHAVE_SIGPROCMASK=1 -DHAVE_SIGSETMASK=1 -I../libtxi -I$(TXIDIR) - -LDADD+= -ltermcap -L../libtxi -ltxi -DPADD+= ${LIBTERMCAP} ${LIBTXI} +CFLAGS+= -DHAVE_SIGPROCMASK=1 -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi -.PATH: $(INFOSRCDIR) +DPADD= ${LIBTERMCAP} ${LIBTXI} +LDADD= -ltermcap ${LIBTXI} .include <bsd.prog.mk> + +.PATH: ${TXIDIR}/info diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile index a158e10..b70b8d3 100644 --- a/gnu/usr.bin/texinfo/install-info/Makefile +++ b/gnu/usr.bin/texinfo/install-info/Makefile @@ -1,27 +1,17 @@ -# -# $Id$ -# +# $Id$ -TEXIDIR= ${.CURDIR}/../../../../contrib/texinfo -INSTALLINFODIR= ${TEXIDIR}/util -TXIDIR= ${TEXIDIR}/libtxi -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a -BINDIR= /usr/bin +PROG= install-info +NOMAN= yes -PROG= install-info -NOMAN=yes -SRCS+= install-info.c - -CFLAGS+= -g CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_ALLOCA=1 CFLAGS+= -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 -DHAVE_STRCHR=1 CFLAGS+= -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -DHAVE_SIGPROCMASK=1 -CFLAGS+= -DHAVE_SIGSETMASK=1 -I../libtxi -I$(TXIDIR) - -LDADD+= -L../libtxi -ltxi -DPADD+= ${LIBTXI} +CFLAGS+= -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi -.PATH: $(INSTALLINFODIR) +DPADD= ${LIBTXI} +LDADD= ${LIBTXI} .include <bsd.prog.mk> + +.PATH: ${TXIDIR}/util diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile index 3f5e8ac..73a3713 100644 --- a/gnu/usr.bin/texinfo/libtxi/Makefile +++ b/gnu/usr.bin/texinfo/libtxi/Makefile @@ -1,20 +1,11 @@ -# -# $Id$ -# +# $Id$ -TXIDIR= ${.CURDIR}/../../../../contrib/texinfo/libtxi +LIB= txi +INTERNALLIB= true +INTERNALSTATICLIB= true -.PATH: $(TXIDIR) - -LIB= txi - -SRCS+= getopt.c getopt1.c - -NOPROFILE= NO -NOPIC= NO -NOSHARED= NO - -install: - @true +SRCS= getopt.c getopt1.c .include <bsd.lib.mk> + +.PATH: ${TXIDIR}/libtxi diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index cdd8a88..a539894 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -1,25 +1,18 @@ -# -# $Id$ -# +# $Id$ -MAKEINFODIR= ${.CURDIR}/../../../../contrib/texinfo/makeinfo -TXIDIR= ${.CURDIR}/../../../../contrib/texinfo/libtxi -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a -BINDIR= /usr/bin - -PROG= makeinfo -NOMAN=yes -SRCS+= makeinfo.c multi.c +PROG= makeinfo +NOMAN= yes +SRCS= makeinfo.c multi.c CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_ALLOCA=1 CFLAGS+= -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 -DHAVE_STRCHR=1 CFLAGS+= -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -DHAVE_SIGPROCMASK=1 -CFLAGS+= -DHAVE_SIGSETMASK=1 -I../libtxi -I$(TXIDIR) - -LDADD+= -L../libtxi -ltxi -DPADD+= ${LIBTXI} +CFLAGS+= -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi -.PATH: $(MAKEINFODIR) +DPADD= ${LIBTXI} +LDADD= ${LIBTXI} .include <bsd.prog.mk> + +.PATH: $(TXIDIR)/makeinfo |