From 40a0135c66e3271eb3842c1b66edef68d00de370 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 9 Oct 2014 10:18:17 +0200 Subject: adaptiosn to use local tolua --- src/modules/urlnormalizer/googleurl/GNUmakefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/modules/urlnormalizer/googleurl/GNUmakefile b/src/modules/urlnormalizer/googleurl/GNUmakefile index da181aa..499e02b 100644 --- a/src/modules/urlnormalizer/googleurl/GNUmakefile +++ b/src/modules/urlnormalizer/googleurl/GNUmakefile @@ -9,11 +9,12 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/include/module \ -I$(TOPDIR)/include/util \ -I$(TOPDIR)/include/crawler \ - -I$(TOPDIR)/googleurl + -I$(TOPDIR)/googleurl \ ifeq ($(WITH_LUA),1) INCLUDE_DIRS += \ - -I$(TOPDIR)/include/luaglue + -I$(TOPDIR)/include/luaglue \ + $(TOLUA_INCLUDES) endif INCLUDE_CXXFLAGS = \ @@ -27,6 +28,11 @@ INCLUDE_LDFLAGS = \ -L$(TOPDIR)/googleurl \ -L$(TOPDIR)/src/libcrawler +ifeq ($(WITH_LUA),1) +INCLUDE_LDFLAGS += \ + $(TOLUA_LDFLAGS) +endif + INCLUDE_LIBS = \ -lgoogleurl \ -lcrawler \ @@ -34,7 +40,8 @@ INCLUDE_LIBS = \ ifeq ($(WITH_LUA),1) INCLUDE_LIBS += \ - -ltolua -llua + -llua \ + $(TOLUA_LIBS) endif DYNAMIC_MODULE = \ @@ -54,7 +61,7 @@ endif -include $(TOPDIR)/makefiles/gmake/sub.mk GoogleURLNormalizerLua.cpp: GoogleURLNormalizer.pkg - tolua -H GoogleURLNormalizerLua.hpp -o GoogleURLNormalizerLua.cpp GoogleURLNormalizer.pkg + $(TOLUA) -H GoogleURLNormalizerLua.hpp -o GoogleURLNormalizerLua.cpp GoogleURLNormalizer.pkg local_all: -- cgit v1.2.3-54-g00ecf