Author: bapt
Date: Wed Aug 6 22:46:15 2014
New Revision: 269649
URL: http://svnweb.freebsd.org/changeset/base/269649
Log:
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
Added:
head/lib/libohash/
- copied from r269624, head/usr.bin/m4/lib/
head/lib/libohash/Makefile (contents, props changed)
Deleted:
head/usr.bin/m4/lib/
Modified:
head/lib/Makefile
head/share/mk/src.libnames.mk
head/usr.bin/m4/Makefile
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Wed Aug 6 22:17:26 2014 (r269648)
+++ head/lib/Makefile Wed Aug 6 22:46:15 2014 (r269649)
@@ -69,6 +69,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libnetgraph} \
${_libngatm} \
libnv \
+ libohash \
libopie \
libpam \
libpcap \
Added: head/lib/libohash/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libohash/Makefile Wed Aug 6 22:46:15 2014 (r269649)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+LIB= ohash
+SRCS= ohash.c
+INTERNALLIB=
+
+WARNS= 3
+
+.include <bsd.lib.mk>
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Wed Aug 6 22:17:26 2014
(r269648)
+++ head/share/mk/src.libnames.mk Wed Aug 6 22:46:15 2014
(r269649)
@@ -44,3 +44,7 @@ LIBUCL?= ${LIBUCLDIR}/libucl.a
LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline
LDREADLINE?= ${LIBREADLINEDIR}/libreadline.a
LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a
+
+LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash
+LDOHASH?= ${LIBOHASHDIR}/libohash.a
+LIBOHASH?= ${LIBOHASHDIR}/libohash.a
Modified: head/usr.bin/m4/Makefile
==============================================================================
--- head/usr.bin/m4/Makefile Wed Aug 6 22:17:26 2014 (r269648)
+++ head/usr.bin/m4/Makefile Wed Aug 6 22:46:15 2014 (r269649)
@@ -7,16 +7,13 @@
.include <src.opts.mk>
PROG= m4
-CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib
-DPADD= ${LIBY} ${LIBL} ${LIBM}
-LDADD= -ly -ll -lm
+CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
+DPADD= ${LIBY} ${LIBL} ${LIBM} ${LIBOHASH}
+LDADD= -ly -ll -lm ${LDOHASH}
NO_WMISSING_VARIABLE_DECLARATIONS=
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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
