From 4cb96d5377df049bd49bb6c0a109d89fcbd015ff Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 7 Sep 2012 15:15:28 +0200 Subject: fixed some linker errors on FreeBSD (should also affect Linux, but there everything worked?) --- src/GNUmakefile | 2 +- src/modules/fetcher/file/GNUmakefile | 2 +- src/modules/fetcher/libfetch/GNUmakefile | 2 +- src/modules/urlfilter/chain/GNUmakefile | 2 +- src/modules/urlfilter/host/GNUmakefile | 2 +- src/modules/urlfilter/protocol/GNUmakefile | 2 +- src/modules/urlnormalizer/googleurl/GNUmakefile | 2 +- src/modules/urlnormalizer/simpleurl/GNUmakefile | 2 +- tests/fetcher/GNUmakefile | 2 +- tests/fetcher/run.sh | 2 +- tests/logger/GNUmakefile | 2 +- tests/modules/GNUmakefile | 2 +- tests/modules/exec_test | 2 +- tests/modules/libcommon/GNUmakefile | 2 +- tests/modules/testmod/GNUmakefile | 2 +- tests/modules/testmod2/GNUmakefile | 2 +- tests/modules/testmod3/GNUmakefile | 2 +- tests/typedetect/GNUmakefile | 2 +- tests/typedetect/exec_test | 2 +- tests/url/GNUmakefile | 2 +- tests/url/exec_test | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/GNUmakefile b/src/GNUmakefile index 9f95bbe..d6b684e 100755 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -17,4 +17,4 @@ local_uninstall: local_test: run: - @LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser $(TOPDIR)/src/crawl/crawl + @LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/src/libcrawler:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser $(TOPDIR)/src/crawl/crawl diff --git a/src/modules/fetcher/file/GNUmakefile b/src/modules/fetcher/file/GNUmakefile index aae99c5..2f15a99 100644 --- a/src/modules/fetcher/file/GNUmakefile +++ b/src/modules/fetcher/file/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/src/modules/fetcher/libfetch/GNUmakefile b/src/modules/fetcher/libfetch/GNUmakefile index a34a0f8..85a3039 100644 --- a/src/modules/fetcher/libfetch/GNUmakefile +++ b/src/modules/fetcher/libfetch/GNUmakefile @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src \ + -L$(TOPDIR)/src/libcrawler \ -L$(TOPDIR)/libfetch INCLUDE_LIBS = \ diff --git a/src/modules/urlfilter/chain/GNUmakefile b/src/modules/urlfilter/chain/GNUmakefile index f91c9e6..171c1a2 100644 --- a/src/modules/urlfilter/chain/GNUmakefile +++ b/src/modules/urlfilter/chain/GNUmakefile @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/src/modules/urlfilter/host/GNUmakefile b/src/modules/urlfilter/host/GNUmakefile index 3b1b616..4db670e 100644 --- a/src/modules/urlfilter/host/GNUmakefile +++ b/src/modules/urlfilter/host/GNUmakefile @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/src/modules/urlfilter/protocol/GNUmakefile b/src/modules/urlfilter/protocol/GNUmakefile index b7418c3..1ac0e34 100644 --- a/src/modules/urlfilter/protocol/GNUmakefile +++ b/src/modules/urlfilter/protocol/GNUmakefile @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/src/modules/urlnormalizer/googleurl/GNUmakefile b/src/modules/urlnormalizer/googleurl/GNUmakefile index 530b2ca..ddd9e73 100644 --- a/src/modules/urlnormalizer/googleurl/GNUmakefile +++ b/src/modules/urlnormalizer/googleurl/GNUmakefile @@ -15,7 +15,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ -L$(TOPDIR)/googleurl \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lgoogleurl \ diff --git a/src/modules/urlnormalizer/simpleurl/GNUmakefile b/src/modules/urlnormalizer/simpleurl/GNUmakefile index 4ec83ee..d7e6378 100644 --- a/src/modules/urlnormalizer/simpleurl/GNUmakefile +++ b/src/modules/urlnormalizer/simpleurl/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/tests/fetcher/GNUmakefile b/tests/fetcher/GNUmakefile index 2b4552d..b89e795 100644 --- a/tests/fetcher/GNUmakefile +++ b/tests/fetcher/GNUmakefile @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/src/modules/fetcher/libfetch INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src \ + -L$(TOPDIR)/src/libcrawler \ -L$(TOPDIR)/src/logger \ -L$(TOPDIR)/libfetch diff --git a/tests/fetcher/run.sh b/tests/fetcher/run.sh index 7a10182..c17fa87 100755 --- a/tests/fetcher/run.sh +++ b/tests/fetcher/run.sh @@ -1,4 +1,4 @@ #!/bin/sh -LD_LIBRARY_PATH=../../src:../../src/logger:../../libfetch ./test1 $* +LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:../../libfetch ./test1 $* diff --git a/tests/logger/GNUmakefile b/tests/logger/GNUmakefile index 6578f15..733f860 100755 --- a/tests/logger/GNUmakefile +++ b/tests/logger/GNUmakefile @@ -10,7 +10,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawler.a \ + $(TOPDIR)/src/libcrawler/libcrawler.a \ $(TOPDIR)/src/logger/liblogger.a TEST_CPP_BINS = \ diff --git a/tests/modules/GNUmakefile b/tests/modules/GNUmakefile index e00e9c9..e0e51e2 100755 --- a/tests/modules/GNUmakefile +++ b/tests/modules/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_LDFLAGS = \ -L$(TOPDIR)/tests/modules/libcommon INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawler.a \ + $(TOPDIR)/src/libcrawler/libcrawler.a \ -llogger -lcommon TEST_CPP_BINS = \ diff --git a/tests/modules/exec_test b/tests/modules/exec_test index 096a7ba..05c9a61 100755 --- a/tests/modules/exec_test +++ b/tests/modules/exec_test @@ -4,5 +4,5 @@ BINARY=$1 TITLE=$2 printf "$BINARY: $TITLE .. " -LD_LIBRARY_PATH=../../src:../../src/logger:libcommon ./$BINARY >$BINARY.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:libcommon ./$BINARY >$BINARY.RES 2>&1 diff $BINARY.MUST $BINARY.RES > $BINARY.DIFF && printf "OK\n" || printf "ERROR\n" diff --git a/tests/modules/libcommon/GNUmakefile b/tests/modules/libcommon/GNUmakefile index bb2df86..e4a5c98 100755 --- a/tests/modules/libcommon/GNUmakefile +++ b/tests/modules/libcommon/GNUmakefile @@ -11,7 +11,7 @@ INCLUDE_LDFLAGS = \ -L$(TOPDIR)/src/logger INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawler.a \ + $(TOPDIR)/src/libcrawler/libcrawler.a \ -llogger STATIC_LIB = libcommon.a diff --git a/tests/modules/testmod/GNUmakefile b/tests/modules/testmod/GNUmakefile index c8fbc8a..0e95bca 100755 --- a/tests/modules/testmod/GNUmakefile +++ b/tests/modules/testmod/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/tests/modules/testmod2/GNUmakefile b/tests/modules/testmod2/GNUmakefile index 2511adb..9dec234 100755 --- a/tests/modules/testmod2/GNUmakefile +++ b/tests/modules/testmod2/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/tests/modules/testmod3/GNUmakefile b/tests/modules/testmod3/GNUmakefile index be1b104..13e1f9e 100755 --- a/tests/modules/testmod3/GNUmakefile +++ b/tests/modules/testmod3/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_DIRS = \ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/tests/typedetect/GNUmakefile b/tests/typedetect/GNUmakefile index d8656fa..9de8acf 100644 --- a/tests/typedetect/GNUmakefile +++ b/tests/typedetect/GNUmakefile @@ -16,7 +16,7 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/src/modules/urlnormalizer/simpleurl INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src \ + -L$(TOPDIR)/src/libcrawler \ -L$(TOPDIR)/src/logger \ -L$(TOPDIR)/libfetch diff --git a/tests/typedetect/exec_test b/tests/typedetect/exec_test index 58747f4..ed30e86 100755 --- a/tests/typedetect/exec_test +++ b/tests/typedetect/exec_test @@ -8,5 +8,5 @@ TITLE=$1 shift printf "$ID: $TITLE .. " -LD_LIBRARY_PATH=../../src:../../src/logger:../../libfetch ./$BINARY $* >$ID.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:../../libfetch ./$BINARY $* >$ID.RES 2>&1 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n" diff --git a/tests/url/GNUmakefile b/tests/url/GNUmakefile index 1325f30..678a914 100644 --- a/tests/url/GNUmakefile +++ b/tests/url/GNUmakefile @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/include/crawler INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src \ + -L$(TOPDIR)/src/libcrawler \ -L$(TOPDIR)/src/logger \ -L$(TOPDIR)/googleurl diff --git a/tests/url/exec_test b/tests/url/exec_test index 5ad22e1..ae9310e 100755 --- a/tests/url/exec_test +++ b/tests/url/exec_test @@ -8,5 +8,5 @@ TITLE=$1 shift printf "$ID: $TITLE .. " -LD_LIBRARY_PATH=../../src:../../src/logger:../../googleurl ./$BINARY $* >$ID.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:../../googleurl ./$BINARY $* >$ID.RES 2>&1 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n" -- cgit v1.2.3-54-g00ecf