flua: move modules source into the main source directory

Follow the path of what is done with bsnmp, build the modules along
with the main binary, this allows to build the modules at a moment
where all needed libraries are already built and available in the
linker path instead of having to declare all the libraries which a
flua module will be linked to in _prebuild_libs.

Discused with:	markj
Reviewed by:	markj, jrtc27, kevans, imp
Accepted by:	kevans, imp
Differential Revision:	https://reviews.freebsd.org/D46610

Makefile.inc1

@@ -3236,8 +3236,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		lib/libxo \
 		${_secure_lib_libcrypto} ${_secure_lib_libssl} \
-		${_lib_libldns} ${_secure_lib_libssh} \
-		lib/libucl
+		${_lib_libldns} ${_secure_lib_libssh}
 
 .if ${MK_DIALOG} != "no"
 _prebuild_libs+= gnu/lib/libdialog
@@ -3292,7 +3291,6 @@ _generic_libs+= ${_DIR}
 
 lib/libtacplus__L: lib/libmd__L lib/libpam/libpam__L
 lib/libxo__L: lib/libutil__L
-lib/libucl__L: lib/msun__L
 
 .if ${MK_CDDL} != "no"
 _cddl_lib_libumem= cddl/lib/libumem

lib/Makefile

@@ -150,11 +150,6 @@ SUBDIR_DEPEND_libpcap= ofed
 .endif
 SUBDIR_DEPEND_nss_tacplus= libtacplus
 
-.if !defined(COMPAT_LIBCOMPAT)
-SUBDIR+=	flua
-SUBDIR_DEPEND_flua=	libjail libucl
-.endif
-
 # NB: keep these sorted by MK_* knobs
 
 SUBDIR.${MK_BEARSSL}+=	libbearssl libsecureboot

lib/flua/Makefile

@@ -1,6 +0,0 @@
-SUBDIR+=	libfreebsd
-SUBDIR+=	libhash
-SUBDIR+=	libjail
-SUBDIR+=	libucl
-
-.include <bsd.subdir.mk>

lib/flua/libfreebsd/sys/linker/Makefile

@@ -1,12 +0,0 @@
-SHLIB_NAME=	linker.so
-SHLIBDIR=	${LIBDIR}/flua/freebsd/sys
-
-SRCS+=		linker.c
-
-CFLAGS+= \
-	-I${SRCTOP}/contrib/lua/src \
-	-I${SRCTOP}/lib/liblua \
-
-MAN=	freebsd.sys.linker.3lua
-
-.include <bsd.lib.mk>

lib/flua/libhash/Makefile

@@ -1,14 +0,0 @@
-SHLIB_NAME=	hash.so
-SHLIBDIR=	${LIBDIR}/flua
-
-SRCS+=		lhash.c
-
-CFLAGS+= \
-	-I${SRCTOP}/contrib/lua/src \
-	-I${SRCTOP}/lib/liblua \
-
-LIBADD+=	md
-
-MAN=	hash.3lua
-
-.include <bsd.lib.mk>

libexec/flua/Makefile

@@ -1,5 +1,10 @@
 .include <src.lua.mk>
 
+SUBDIR+=	libfreebsd
+SUBDIR+=	libhash
+SUBDIR+=	libjail
+SUBDIR+=	libucl
+
 LUASRC?=	${SRCTOP}/contrib/lua/src
 .PATH: ${LUASRC}
 

libexec/flua/Makefile.inc

@@ -0,0 +1,5 @@
+SHLIBDIR?=	${LIBDIR}/flua
+
+CFLAGS+=	\
+		-I${SRCTOP}/contrib/lua/src \
+		-I${SRCTOP}/lib/liblua

libexec/flua/libfreebsd/Makefile.inc

@@ -0,0 +1 @@
+.include "../Makefile.inc"

libexec/flua/libfreebsd/sys/Makefile.inc

@@ -0,0 +1 @@
+.include "../Makefile.inc"

libexec/flua/libfreebsd/sys/linker/Makefile

@@ -0,0 +1,7 @@
+SHLIB_NAME=	linker.so
+
+SRCS+=		linker.c
+
+MAN=	freebsd.sys.linker.3lua
+
+.include <bsd.lib.mk>

libexec/flua/libhash/Makefile

@@ -0,0 +1,9 @@
+SHLIB_NAME=	hash.so
+
+SRCS+=		lhash.c
+
+LIBADD+=	md
+
+MAN=	hash.3lua
+
+.include <bsd.lib.mk>

libexec/flua/libjail/Makefile

@@ -1,12 +1,7 @@
 SHLIB_NAME=	jail.so
-SHLIBDIR=	${LIBDIR}/flua
 
 SRCS+=		lua_jail.c
 
-CFLAGS+= \
-	-I${SRCTOP}/contrib/lua/src \
-	-I${SRCTOP}/lib/liblua \
-
 LIBADD+=	jail
 
 MAN=	jail.3lua

libexec/flua/libucl/Makefile

@@ -1,5 +1,4 @@
 SHLIB_NAME=	ucl.so
-SHLIBDIR=	${LIBDIR}/flua
 
 WARNS=		2
 
@@ -7,8 +6,6 @@ UCLSRC?= 	${SRCTOP}/contrib/libucl
 .PATH: ${UCLSRC}/lua
 SRCS+=		lua_ucl.c
 CFLAGS+=	\
-		-I${SRCTOP}/contrib/lua/src \
-		-I${SRCTOP}/lib/liblua \
 		-I${UCLSRC}/include \
 		-I${UCLSRC}/src \
 		-I${UCLSRC}/uthash

stand/defs.mk

@@ -64,7 +64,7 @@ BINDIR?=	/boot
 # LUAPATH is where we search for and install lua scripts.
 LUAPATH?=	/boot/lua
 FLUASRC?=	${SRCTOP}/libexec/flua
-FLUALIB?=	${SRCTOP}/lib/flua
+FLUALIB?=	${SRCTOP}/libexec/flua
 
 LIBSA=		${BOOTOBJ}/libsa/libsa.a
 .if ${MACHINE} == "i386"