Просмотр исходного кода

app_lua: explicit link against libm only of no pkg-config or lua-config is found

- otherwise it appears two times in the libs linking string
Daniel-Constantin Mierla 13 лет назад
Родитель
Сommit
231e7fcfdd
1 измененных файлов с 4 добавлено и 5 удалено
  1. 4 5
      modules/app_lua/Makefile

+ 4 - 5
modules/app_lua/Makefile

@@ -14,10 +14,10 @@ ifeq ($(BUILDER),)
 		LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1)
 		LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1)
 		ifeq ($(LUA51),)
 		ifeq ($(LUA51),)
 			DEFS+=-I/usr/include/lua
 			DEFS+=-I/usr/include/lua
-			LIBS= -llua
+			LIBS= -llua -lm
 		else
 		else
 			DEFS+=-I/usr/include/lua5.1
 			DEFS+=-I/usr/include/lua5.1
-			LIBS= -llua5.1
+			LIBS= -llua5.1 -lm
 		endif
 		endif
 	else
 	else
 		LUAVER=XX
 		LUAVER=XX
@@ -34,10 +34,10 @@ ifeq ($(BUILDER),)
 			LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1)
 			LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1)
 			ifeq ($(LUA51),)
 			ifeq ($(LUA51),)
 				DEFS+=-I/usr/include/lua
 				DEFS+=-I/usr/include/lua
-				LIBS= -llua
+				LIBS= -llua -lm
 			else
 			else
 				DEFS+=-I/usr/include/lua5.1
 				DEFS+=-I/usr/include/lua5.1
-				LIBS= -llua5.1
+				LIBS= -llua5.1 -lm
 			endif
 			endif
 		else
 		else
 			ifeq ($(LUAVER),51)
 			ifeq ($(LUAVER),51)
@@ -54,7 +54,6 @@ else
 	LIBS = $(shell lua-config --libs)
 	LIBS = $(shell lua-config --libs)
 endif
 endif
 
 
-LIBS+=-lm
 DEFS+=-DOPENSER_MOD_INTERFACE
 DEFS+=-DOPENSER_MOD_INTERFACE
 
 
 SERLIBPATH=../../lib
 SERLIBPATH=../../lib