From 2b706e899806ee3ae7f7eebe085fbbf7837362c0 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Mon, 20 Jun 2011 17:40:43 +0200
Subject: Makefile: fix linking against LuaJIT on Debian

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2da0125..d14ab5f 100644
--- a/Makefile
+++ b/Makefile
@@ -28,14 +28,14 @@ else
 SHARED       = -shared
 endif
 
-ifeq ($(LUA),embedded)
-CFLAGS      += -Ilua -DLUA_USE_LINUX -DLUA_ROOT='"$(PREFIX)/"'
 LIBRARIES    = -lm
-
 ifeq ($(OS), Linux)
 LIBRARIES   += -ldl
 endif
 
+ifeq ($(LUA),embedded)
+CFLAGS      += -Ilua -DLUA_USE_LINUX -DLUA_ROOT='"$(PREFIX)/"'
+
 headers     += lua/luaconf.h lua/lua.h lua/lauxlib.h
 # From lua/Makefile
 CORE_O       = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
@@ -53,12 +53,12 @@ LUA_PATH     = $(shell $(LUA) -e 'print(package.path:match("([^;]*/lua/$(LUA_VER
 LUA_CPATH    = $(shell $(LUA) -e 'print(package.cpath:match("([^;]*/lua/$(LUA_VERSION))"))')
 
 ifeq ($(findstring LuaJIT, $(shell $(LUA) -v 2>&1)),)
-LIBRARIES    = -llua
+LIBRARIES   += -llua
 LUA_INCDIR   = $(INCDIR)
 LIB_INCLUDES = -I$(LUA_INCDIR)
 else
 CFLAGS      += $(shell $(PKGCONFIG) --cflags luajit)
-LIBRARIES    = $(shell $(PKGCONFIG) --libs luajit)
+LIBRARIES   += $(shell $(PKGCONFIG) --libs luajit)
 LIB_INCLUDES = -I$(INCDIR) $(shell $(PKGCONFIG) --cflags-only-I luajit)
 endif
 endif
@@ -100,7 +100,7 @@ event.o: CFLAGS += -w
 
 lem: $(objects)
 	$Mecho '  LD $@'
-	$O$(CC) -rdynamic $(LIBRARIES) $(LDFLAGS) $^ -o $@
+	$O$(CC) $^ -rdynamic $(LDFLAGS) $(LIBRARIES) -o $@
 
 utils.so: utils.pic.o
 	$Mecho '  LD $@'
-- 
cgit v1.2.1