diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2012-09-02 11:14:10 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2012-09-02 11:14:10 +0200 |
| commit | 2647605b72b36c0d106c2418f8ea411fb6a8e1a8 (patch) | |
| tree | b1a349489549a39cd003b9d8b969b337c5473e50 | |
| parent | 13da385aa7f5e9a9f52288fd7735d6dc806fab73 (diff) | |
| download | crawler-2647605b72b36c0d106c2418f8ea411fb6a8e1a8.tar.gz crawler-2647605b72b36c0d106c2418f8ea411fb6a8e1a8.tar.bz2 | |
some more fixes in linking
| -rw-r--r-- | tests/fetcher/GNUmakefile | 8 | ||||
| -rw-r--r-- | tests/typedetect/GNUmakefile | 8 | ||||
| -rwxr-xr-x | tests/typedetect/exec_test | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/tests/fetcher/GNUmakefile b/tests/fetcher/GNUmakefile index b26f916..d6fa6ad 100644 --- a/tests/fetcher/GNUmakefile +++ b/tests/fetcher/GNUmakefile @@ -10,13 +10,15 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/src/modules/urlnormalizer/simpleurl \ -I$(TOPDIR)/src/modules/fetcher/libfetch -INCLUDE_LDFLAGS = +INCLUDE_LDFLAGS = \ + -L$(TOPDIR)/src \ + -L$(TOPDIR)/libfetch INCLUDE_LIBS = \ $(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \ $(TOPDIR)/src/modules/fetcher/libfetch/liblibfetchfetcher.a \ - $(TOPDIR)/src/libcrawler.a \ - $(TOPDIR)/libfetch/libfetch.a + -lcrawler \ + -lfetch # openssl ifeq ($(WITH_SSL),1) diff --git a/tests/typedetect/GNUmakefile b/tests/typedetect/GNUmakefile index 4ddeacc..6fed180 100644 --- a/tests/typedetect/GNUmakefile +++ b/tests/typedetect/GNUmakefile @@ -12,16 +12,18 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/src/modules/fetcher/libfetch \ -I$(TOPDIR)/src/modules/urlnormalizer/simpleurl -INCLUDE_LDFLAGS = +INCLUDE_LDFLAGS = \ + -L$(TOPDIR)/src \ + -L$(TOPDIR)/libfetch INCLUDE_LIBS = \ $(TOPDIR)/src/modules/typedetect/libmagic/liblibmagictypedetect.a \ -lmagic \ $(TOPDIR)/src/modules/fetcher/file/libfilefetcher.a \ $(TOPDIR)/src/modules/fetcher/libfetch/liblibfetchfetcher.a \ - $(TOPDIR)/libfetch/libfetch.a \ + -lfetch \ $(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \ - $(TOPDIR)/src/libcrawler.a + -lcrawler # openssl ifeq ($(WITH_SSL),1) diff --git a/tests/typedetect/exec_test b/tests/typedetect/exec_test index 92b656f..5d3d9b1 100755 --- a/tests/typedetect/exec_test +++ b/tests/typedetect/exec_test @@ -8,5 +8,5 @@ TITLE=$1 shift printf "$ID: $TITLE .. " -./$BINARY $* >$ID.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../libfetch ./$BINARY $* >$ID.RES 2>&1 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n" |