Make libohash a proper internallib instead of hidding it in m4

mandoc development seems to be also using ohash so prepare to share the code when
needed
This commit is contained in:
Baptiste Daroussin 2014-08-06 22:46:15 +00:00
parent d029c3aa25
commit e806d5088b
8 changed files with 17 additions and 6 deletions

View File

@ -69,6 +69,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libnetgraph} \ ${_libnetgraph} \
${_libngatm} \ ${_libngatm} \
libnv \ libnv \
libohash \
libopie \ libopie \
libpam \ libpam \
libpcap \ libpcap \

9
lib/libohash/Makefile Normal file
View File

@ -0,0 +1,9 @@
# $FreeBSD$
LIB= ohash
SRCS= ohash.c
INTERNALLIB=
WARNS= 3
.include <bsd.lib.mk>

View File

@ -44,3 +44,7 @@ LIBUCL?= ${LIBUCLDIR}/libucl.a
LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline
LDREADLINE?= ${LIBREADLINEDIR}/libreadline.a LDREADLINE?= ${LIBREADLINEDIR}/libreadline.a
LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a
LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash
LDOHASH?= ${LIBOHASHDIR}/libohash.a
LIBOHASH?= ${LIBOHASHDIR}/libohash.a

View File

@ -7,16 +7,13 @@
.include <src.opts.mk> .include <src.opts.mk>
PROG= m4 PROG= m4
CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
DPADD= ${LIBY} ${LIBL} ${LIBM} DPADD= ${LIBY} ${LIBL} ${LIBM} ${LIBOHASH}
LDADD= -ly -ll -lm LDADD= -ly -ll -lm ${LDOHASH}
NO_WMISSING_VARIABLE_DECLARATIONS= NO_WMISSING_VARIABLE_DECLARATIONS=
SRCS= eval.c expr.c look.c main.c misc.c gnum4.c trace.c parser.y tokenizer.l SRCS= eval.c expr.c look.c main.c misc.c gnum4.c trace.c parser.y tokenizer.l
.PATH: ${.CURDIR}/lib
SRCS+= ohash.c
WARNS= 3
tokenizer.o: parser.h tokenizer.o: parser.h