From 9b1bfff495f71f964064743e0d1f95c6a577b903 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 21 Aug 2020 14:21:16 -0400 Subject: Slight modification to makefile --- Makefile | 8 ++++- lua-nng-dev-1.rockspec | 92 +++++++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index d82ee92..3f85978 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,12 @@ CC?=gcc CAFLAGS+=-I$(NNG_INCDIR) -I$(LUA_INCDIR) $(CFLAGS) -LADFLAGS+=$(LIBFLAG) $(LDFLAGS) -L$(NNG_LIBDIR) -L$(LUA_LIBDIR) +LADFLAGS+=$(LIBFLAG) $(LDFLAGS) +ifdef $(NNG_LIBDIR) + LADFLAGS+= -L$(NNG_LIBDIR) +endif +ifdef $(LUA_LIBDIR) + LADFLAGS+= -L$(LUA_LIBDIR) +endif LD=gcc LIBS=-lnng -llua53 diff --git a/lua-nng-dev-1.rockspec b/lua-nng-dev-1.rockspec index 3229e99..47097c0 100644 --- a/lua-nng-dev-1.rockspec +++ b/lua-nng-dev-1.rockspec @@ -1,46 +1,46 @@ -package = "lua-nng" -rockspec_format="3.0" -version = "dev-1" -source = { - url = "git+https://cogarr.net/source/cgit.cgi/lua-nng", - --tag = "v0.1" -} -description = { - summary = "A simple binding for Nanomessage Next Generation", - homepage = "https://cogarr.net/source/cgit.cgi/lua-nng/about", - license = "BSD/2 Clause", - maintainer = "Alexander Pickering ", - labels = {"network","nanomessage","nng"} -} -external_dependencies = { - NNG = { - library = "nng", - header = "nng/nng.h" - } -} -build = { - type = "make", - build_variables = { - CFLAGS="$(CFLAGS)", - LUA_INCDIR="$(LUA_INCDIR)", - NNG_INCDIR="$(NNG_INCDIR)", - NNG_LIBDIR="$(NNG_LIBDIR)", - LUA_LIBDIR="$(LUA_LIBDIR)", - FIND="$(FIND)", - LIB_EXTENSION="$(LIB_EXTENSION)", - LIBFLAG="$(LIBFLAG)", - }, - install_variables = { - INST_PREFIX="$(PREFIX)", - INST_LIBDIR="$(LIBDIR)", - NNG_LIBDIR="$(NNG_LIBDIR)", - LUA_LIBDIR="$(LUA_LIBDIR)", - LIB_EXTENSION="$(LIB_EXTENSION)", - CP="$(CP)", - }, - install = { - bin = { - "bin/nng.dll" - } - } -} +package = "lua-nng" +rockspec_format="3.0" +version = "dev-1" +source = { + url = "git+https://cogarr.net/source/cgit.cgi/lua-nng", + --tag = "v0.1" +} +description = { + summary = "A simple binding for Nanomessage Next Generation", + homepage = "https://cogarr.net/source/cgit.cgi/lua-nng/about", + license = "BSD/2 Clause", + maintainer = "Alexander Pickering ", + labels = {"network","nanomessage","nng"} +} +external_dependencies = { + NNG = { + library = "nng", + header = "nng/nng.h" + } +} +build = { + type = "make", + build_variables = { + CFLAGS="$(CFLAGS)", + LUA_INCDIR="$(LUA_INCDIR)", + LUA_LIBDIR="$(LUA_LIBDIR)", + NNG_INCDIR="$(NNG_INCDIR)", + NNG_LIBDIR="$(NNG_LIBDIR)", + FIND="$(FIND)", + LIB_EXTENSION="$(LIB_EXTENSION)", + LIBFLAG="$(LIBFLAG)", + }, + install_variables = { + INST_PREFIX="$(PREFIX)", + INST_LIBDIR="$(LIBDIR)", + NNG_LIBDIR="$(NNG_LIBDIR)", + LUA_LIBDIR="$(LUA_LIBDIR)", + LIB_EXTENSION="$(LIB_EXTENSION)", + CP="$(CP)", + }, + install = { + bin = { + "bin/nng.dll" + } + } +} -- cgit v1.2.3-70-g09d2