From 44c3d0908310cd2455a90cd8f2454712573b1902 Mon Sep 17 00:00:00 2001 From: thefosk Date: Fri, 13 Nov 2015 15:41:08 -0800 Subject: Updating Makefile and rockspec + version bump --- Makefile | 5 ++++- lua_uuid-0.1-4.rockspec | 25 ------------------------- lua_uuid-0.1-5.rockspec | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 lua_uuid-0.1-4.rockspec create mode 100644 lua_uuid-0.1-5.rockspec diff --git a/Makefile b/Makefile index cb124b3..cf372f8 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ LUA_PC ?= lua5.1 LUA_LIBS ?= $(shell pkg-config $(LUA_PC) --libs) LUA_CFLAGS = $(shell pkg-config $(LUA_PC) --cflags) -CFLAGS ?= -O3 -Wall -Werror +CFLAGS ?= -O2 -Wall -Werror all: lua_uuid.so @@ -14,5 +14,8 @@ lua_uuid.so: lua_uuid.o test/lua_uuid_test.lua $(CC) -shared lua_uuid.o $(LUA_LIBS) -o $@ $(LUA) test/lua_uuid_test.lua +install: lua_uuid.so + cp lua_uuid.so $(INST_LIBDIR) + clean: rm -f lua_uuid.so lua_uuid.o *.rock diff --git a/lua_uuid-0.1-4.rockspec b/lua_uuid-0.1-4.rockspec deleted file mode 100644 index 4408cd1..0000000 --- a/lua_uuid-0.1-4.rockspec +++ /dev/null @@ -1,25 +0,0 @@ -package = "lua_uuid" -version = "0.1-4" -source = { - url = "https://github.com/Mashape/lua-uuid/archive/0.1-4.tar.gz", - dir = "lua-uuid-0.1-4" -} -description = { - summary = "UUID generation", - detailed = [[ - This is an utility that leverages libuuid to generate UUID strings - ]], - homepage = "https://github.com/Mashape/lua-uuid", - license = "MIT" -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "builtin", - modules = { - lua_uuid = { - sources = {"lua_uuid.c"}, - } - } -} \ No newline at end of file diff --git a/lua_uuid-0.1-5.rockspec b/lua_uuid-0.1-5.rockspec new file mode 100644 index 0000000..3dce9f6 --- /dev/null +++ b/lua_uuid-0.1-5.rockspec @@ -0,0 +1,23 @@ +package = "lua_uuid" +version = "0.1-5" +source = { + url = "https://github.com/Mashape/lua-uuid/archive/0.1-5.tar.gz", + dir = "lua-uuid-0.1-5" +} +description = { + summary = "UUID generation", + detailed = [[ + This is an utility that leverages libuuid to generate UUID strings + ]], + homepage = "https://github.com/Mashape/lua-uuid", + license = "MIT" +} +dependencies = { + "lua >= 5.1" +} +build = { + type = "make", + install_variables = { + INST_LIBDIR = "$(LIBDIR)" + } +} \ No newline at end of file -- cgit v1.2.3-70-g09d2