diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/GNUmakefile | 2 | ||||
| -rwxr-xr-x | src/crawl/GNUmakefile | 8 | ||||
| -rwxr-xr-x | src/libcrawler/GNUmakefile | 1 | ||||
| -rwxr-xr-x | src/libluaglue/GNUmakefile | 4 | ||||
| -rw-r--r-- | src/modules/fetcher/GNUmakefile | 6 |
5 files changed, 17 insertions, 4 deletions
diff --git a/src/GNUmakefile b/src/GNUmakefile index 9bd6fe4..36e98b1 100755 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -22,7 +22,7 @@ VALKYRIE=valkyrie PERFCHECK=${HOME}/scripts/qcachegrind.sh -LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/libutil:$(TOPDIR)/src/liblogger:$(TOPDIR)/src/libcrawler:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser:$(TOPDIR)/src/libluaglue +LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/libutil:$(TOPDIR)/src/liblogger:$(TOPDIR)/src/libcrawler:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser:$(TOPDIR)/src/libluaglue:$(TOPDIR)/lua/src run: LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(TOPDIR)/src/crawl/crawl $(TOPDIR)/src/crawl/crawl.conf diff --git a/src/crawl/GNUmakefile b/src/crawl/GNUmakefile index 778a72a..5c99362 100755 --- a/src/crawl/GNUmakefile +++ b/src/crawl/GNUmakefile @@ -36,7 +36,13 @@ endif ifeq ($(WITH_LUA),1) INCLUDE_CXXFLAGS += \ - -DWITH_LUA + -DWITH_LUA \ + -I$(TOPDIR)/lua/src +endif + +ifeq ($(WITH_LUA),1) +INCLUDE_LDFLAGS += \ + -L$(TOPDIR)/lua/src endif CPP_OBJS = \ diff --git a/src/libcrawler/GNUmakefile b/src/libcrawler/GNUmakefile index e337c4f..a74d128 100755 --- a/src/libcrawler/GNUmakefile +++ b/src/libcrawler/GNUmakefile @@ -34,6 +34,7 @@ INCLUDE_LIBS = \ ifeq ($(WITH_LUA),1) INCLUDE_LIBS += \ + -L$(TOPDIR)/lua/src \ -llua \ $(TOLUA_LIBS) endif diff --git a/src/libluaglue/GNUmakefile b/src/libluaglue/GNUmakefile index c39d741..076d1cc 100755 --- a/src/libluaglue/GNUmakefile +++ b/src/libluaglue/GNUmakefile @@ -7,12 +7,14 @@ SUBDIRS = INCLUDE_CPPFLAGS = \ INCLUDE_LDFLAGS = \ + -L$(TOPDIR)/lua/src INCLUDE_DIRS = \ -I. \ -I$(TOPDIR)/include \ -I$(TOPDIR)/include/luaglue \ - -I$(TOPDIR)/include/util + -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/lua/src INCLUDE_LIBS = \ diff --git a/src/modules/fetcher/GNUmakefile b/src/modules/fetcher/GNUmakefile index feb638c..d4f3684 100644 --- a/src/modules/fetcher/GNUmakefile +++ b/src/modules/fetcher/GNUmakefile @@ -1,11 +1,15 @@ TOPDIR = ../../.. -SUBDIRS = libfetch file +SUBDIRS = file ifeq ($(WITH_CURL),1) SUBDIRS += libcurl endif +ifeq ($(WITH_LIBFETCH),1) +SUBDIRS += libfetch +endif + -include $(TOPDIR)/makefiles/gmake/sub.mk local_all: |