Module Name:    src
Committed By:   mbalmer
Date:           Sun Oct 16 00:45:09 UTC 2011

Modified Files:
        src/share/mk: bsd.lua.mk

Log Message:
Uncomment LUA_DPLIBS processing, but do not auto-include liblua.so,
under the assumption that programs that load Lua modules already have
loaded it.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/mk/bsd.lua.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.lua.mk
diff -u src/share/mk/bsd.lua.mk:1.3 src/share/mk/bsd.lua.mk:1.4
--- src/share/mk/bsd.lua.mk:1.3	Sat Oct  8 08:35:56 2011
+++ src/share/mk/bsd.lua.mk	Sun Oct 16 00:45:09 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lua.mk,v 1.3 2011/10/08 08:35:56 mbalmer Exp $
+#	$NetBSD: bsd.lua.mk,v 1.4 2011/10/16 00:45:09 mbalmer Exp $
 #
 # Build rules and definitions for Lua modules
 
@@ -10,7 +10,6 @@
 #
 # LUA_MODULES	list of Lua modules to build/installi
 # LUA_DPLIBS	shared library dependencies as per LIBDPLIBS
-#		(liblua is automatically included)
 #
 # LUA_SRCS.mod	sources for each module (by default: "${mod:S/./_/g}.lua")
 #
@@ -82,14 +81,14 @@ CFLAGS+=	-fPIC -DPIC
 
 ##
 ##### Libraries that modules may depend upon.
-#.for _lib _dir in lua ${NETBSDSRCDIR}/external/mit/lua/lib/liblua ${LUA_DPLIBS}
-#.if !defined(LIBDO.${_lib})
-#LIBDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
-#.MAKEOVERRIDES+=LIBDO.${_lib}
-#.endif
-#LDADD+=-L${LIBDO.${_lib}} -l${_lib}
-#DPADD+=${LIBDO.${_lib}}/lib${_lib}.so
-#.endfor
+.for _lib _dir in ${LUA_DPLIBS}
+.if !defined(LIBDO.${_lib})
+LIBDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
+.MAKEOVERRIDES+=LIBDO.${_lib}
+.endif
+LDADD+=-L${LIBDO.${_lib}} -l${_lib}
+DPADD+=${LIBDO.${_lib}}/lib${_lib}.so
+.endfor
 
 ##
 ##### Lua Modules

Reply via email to