diff options
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | lua-nng-master-1.rockspec | 40 |
2 files changed, 11 insertions, 49 deletions
@@ -1,22 +1,24 @@ CC?=gcc -CAFLAGS+=-I$(NNG_INCDIR) -I$(LUA_INCDIR) -L$(LUA_LIBDIR) $(CFLAGS) -LADFLAGS+=$(LIBFLAG) $(LDFLAGS) -LIBS=-lnng +LIBS?=-lnng ifdef NNG_LIBDIR - LADFLAGS+= -L$(NNG_LIBDIR) + LDFLAGS+= -L$(NNG_LIBDIR) endif ifdef LUA_LIBDIR - LADFLAGS+= -L$(LUA_LIBDIR) + LDFLAGS+= -L$(LUA_LIBDIR) endif ifdef LUA_LIB LIBS+= -l$(LUA_LIB) endif -LD=gcc +ifdef NNG_INCDIR + CFLAGS+= -I$(NNG_INCDIR) +endif +ifdef LUA_INCDIR + CFLAGS+= -I$(LUA_INCDIR) +endif ifeq ($(OS), Windows_NT) LDFLAGS+=-mwindows LIBS+=-lws2_32 -else endif @@ -30,14 +32,14 @@ installed_target=$(target:bin/%=$(INST_LIBDIR)/%) all: $(target) $(target) : $(obj_files) - $(LD) $(LADFLAGS) -o $@ $^ $(LIBS) + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(installed_target) : $(target) $(MKDIR) -p $(@D) $(CP) $< $@ $(obj_files): build/%.o : src/%.c - $(CC) $(CAFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< install: $(installed_target) diff --git a/lua-nng-master-1.rockspec b/lua-nng-master-1.rockspec deleted file mode 100644 index 9075cb3..0000000 --- a/lua-nng-master-1.rockspec +++ /dev/null @@ -1,40 +0,0 @@ -package = "lua-nng" -rockspec_format="3.0" -version = "master-1" -source = { - url = "git+https://cogarr.net/source/cgit.cgi/lua-nng", -} -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 <alex@cogarr.net>", - 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)", - }, -} |