diff options
| author | thefosk <marco@mashape.com> | 2015-11-13 15:52:51 -0800 |
|---|---|---|
| committer | thefosk <marco@mashape.com> | 2015-11-13 15:52:51 -0800 |
| commit | 54af6a4aecdca9f0b8df5d2425da82b1e31b03d5 (patch) | |
| tree | 1ac92c7969fc52fdf6b37ea65ab639b59a11f5d7 | |
| parent | b484545922f4c5d6dda86e0f66cb3622da654d53 (diff) | |
| download | lua_uuid-54af6a4aecdca9f0b8df5d2425da82b1e31b03d5.tar.gz lua_uuid-54af6a4aecdca9f0b8df5d2425da82b1e31b03d5.tar.bz2 lua_uuid-54af6a4aecdca9f0b8df5d2425da82b1e31b03d5.zip | |
Makefile cleanup
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | lua_uuid-0.1-7.rockspec (renamed from lua_uuid-0.1-6.rockspec) | 12 |
2 files changed, 13 insertions, 15 deletions
@@ -1,18 +1,10 @@ -LUA ?= lua5.1 -LUA_PC ?= lua5.1 -LUA_LIBS ?= $(shell pkg-config $(LUA_PC) --libs) -LUA_CFLAGS = $(shell pkg-config $(LUA_PC) --cflags) - -CFLAGS ?= -O2 -Wall -Werror - all: lua_uuid.so -%.o: %.c - $(CC) -c $(CFLAGS) -fPIC $(LUA_CFLAGS) -o $@ $< +lua_uuid.so: lua_uuid.o + $(CC) $(LIBFLAG) -luuid -o $@ -L$(LUA_LIBDIR) $< -lua_uuid.so: lua_uuid.o test/lua_uuid_test.lua - $(CC) -shared lua_uuid.o $(LUA_LIBS) -luuid -o $@ - $(LUA) test/lua_uuid_test.lua +lua_uuid.o: lua_uuid.c + $(CC) -c $(CFLAGS) -I$(LUA_INCDIR) $< -o $@ install: lua_uuid.so cp lua_uuid.so $(INST_LIBDIR) diff --git a/lua_uuid-0.1-6.rockspec b/lua_uuid-0.1-7.rockspec index 1e01767..e0c12b5 100644 --- a/lua_uuid-0.1-6.rockspec +++ b/lua_uuid-0.1-7.rockspec @@ -1,8 +1,8 @@ package = "lua_uuid" -version = "0.1-6" +version = "0.1-7" source = { - url = "https://github.com/Mashape/lua-uuid/archive/0.1-6.tar.gz", - dir = "lua-uuid-0.1-6" + url = "https://github.com/Mashape/lua-uuid/archive/0.1-7.tar.gz", + dir = "lua-uuid-0.1-7" } description = { summary = "UUID generation", @@ -17,6 +17,12 @@ dependencies = { } build = { type = "make", + build_variables = { + CFLAGS="$(CFLAGS)", + LIBFLAG="$(LIBFLAG)", + LUA_LIBDIR="$(LUA_LIBDIR)", + LUA_INCDIR="$(LUA_INCDIR)" + }, install_variables = { INST_LIBDIR = "$(LIBDIR)" } |