aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile21
-rw-r--r--lua_uuid-0.1-7.rockspec5
-rwxr-xr-x[-rw-r--r--]test/lua_uuid_test.lua0
3 files changed, 20 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index fb6e6ca..0e37c26 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,26 @@
+LUA ?= lua5.1
+LUA_LIBDIR ?= $(shell pkg-config $(LUA) --libs)
+LUA_INCDIR ?= $(shell pkg-config $(LUA) --cflags)
+
+UUID_LIBDIR ?= $(shell pkg-config uuid --libs)
+UUID_INCDIR ?= $(shell pkg-config uuid --cflags)
+
+LIBFLAG ?= -shared
+CFLAGS ?= -O2 -Wall -Werror
+
+.PHONY: all clean install
+
all: lua_uuid.so
lua_uuid.so: lua_uuid.o
- $(CC) $(LIBFLAG) -luuid -o $@ -L$(LUA_LIBDIR) $<
+ $(CC) $(LIBFLAG) $(LUA_LIBDIR) $(UUID_LIBDIR) $< -o $@
+ $(LUA) test/lua_uuid_test.lua
-lua_uuid.o: lua_uuid.c
- $(CC) -c $(CFLAGS) -I$(LUA_INCDIR) $< -o $@
+%.o: %.c
+ $(CC) -c $(CFLAGS) -fPIC $(LUA_INCDIR) $(UUID_INCDIR) $< -o $@
install: lua_uuid.so
cp lua_uuid.so $(INST_LIBDIR)
clean:
- rm -f lua_uuid.so lua_uuid.o *.rock
+ rm -f *.so *.o *.rock
diff --git a/lua_uuid-0.1-7.rockspec b/lua_uuid-0.1-7.rockspec
index e0c12b5..8cc65ab 100644
--- a/lua_uuid-0.1-7.rockspec
+++ b/lua_uuid-0.1-7.rockspec
@@ -10,7 +10,7 @@ description = {
This is an utility that leverages libuuid to generate UUID strings
]],
homepage = "https://github.com/Mashape/lua-uuid",
- license = "MIT"
+ license = "MIT"
}
dependencies = {
"lua >= 5.1"
@@ -18,6 +18,7 @@ dependencies = {
build = {
type = "make",
build_variables = {
+ LUA="$(LUA)",
CFLAGS="$(CFLAGS)",
LIBFLAG="$(LIBFLAG)",
LUA_LIBDIR="$(LUA_LIBDIR)",
@@ -26,4 +27,4 @@ build = {
install_variables = {
INST_LIBDIR = "$(LIBDIR)"
}
-} \ No newline at end of file
+}
diff --git a/test/lua_uuid_test.lua b/test/lua_uuid_test.lua
index 19ebf67..19ebf67 100644..100755
--- a/test/lua_uuid_test.lua
+++ b/test/lua_uuid_test.lua