diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2012-09-06 22:38:42 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2012-09-06 22:38:42 +0200 |
| commit | 374c902e272f06833cfc67e3b8bd86cc7ae7cd3c (patch) | |
| tree | 58a792daf622c54255c41368dfa7ec83d9e8b16e | |
| parent | 77bf153e1fa69fa151f32aedd400d5b51220b701 (diff) | |
| download | crawler-374c902e272f06833cfc67e3b8bd86cc7ae7cd3c.tar.gz crawler-374c902e272f06833cfc67e3b8bd86cc7ae7cd3c.tar.bz2 | |
crawler fixed on Linux
| -rw-r--r-- | include/crawler/MIMEType.hpp | 4 | ||||
| -rwxr-xr-x | src/GNUmakefile | 3 | ||||
| -rwxr-xr-x | src/crawl/GNUmakefile | 11 | ||||
| -rwxr-xr-x | src/libcrawler/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/modules/deduper/null/GNUmakefile | 5 | ||||
| -rw-r--r-- | src/modules/fetcher/file/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/modules/fetcher/libfetch/GNUmakefile | 1 | ||||
| -rw-r--r-- | src/modules/frontier/memory/GNUmakefile | 5 | ||||
| -rw-r--r-- | src/modules/processor/htmllinkextract/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/modules/typedetect/libmagic/GNUmakefile | 5 | ||||
| -rw-r--r-- | src/modules/urlfilter/chain/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/modules/urlfilter/host/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/modules/urlfilter/protocol/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/modules/urlnormalizer/googleurl/GNUmakefile | 1 | ||||
| -rw-r--r-- | src/modules/urlnormalizer/simpleurl/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/modules/urlseen/memory/GNUmakefile | 5 |
16 files changed, 38 insertions, 23 deletions
diff --git a/include/crawler/MIMEType.hpp b/include/crawler/MIMEType.hpp index 3a628ca..d5557b8 100644 --- a/include/crawler/MIMEType.hpp +++ b/include/crawler/MIMEType.hpp @@ -6,6 +6,8 @@ #include <iostream> #include <sstream> +#include "CrawlerExportable.hpp" + class MIMEType { protected: std::string m_type; @@ -64,7 +66,7 @@ class MIMEType { return os.str( ); } - static MIMEType Null; + static CRAWLER_DLL_VISIBLE MIMEType Null; bool operator!=( const MIMEType &other ) const { diff --git a/src/GNUmakefile b/src/GNUmakefile index 7367ce2..9f95bbe 100755 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -15,3 +15,6 @@ local_install: local_uninstall: local_test: + +run: + @LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser $(TOPDIR)/src/crawl/crawl diff --git a/src/crawl/GNUmakefile b/src/crawl/GNUmakefile index 6899fde..4cecdd1 100755 --- a/src/crawl/GNUmakefile +++ b/src/crawl/GNUmakefile @@ -10,13 +10,15 @@ INCLUDE_DIRS = \ -I. \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ - -I$(TOPDIR)/include/module + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/crawler INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src/logger + -L$(TOPDIR)/src/logger \ + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ - -llogger + -llogger -lcrawler # openssl ifeq ($(WITH_SSL),1) @@ -50,6 +52,3 @@ local_uninstall: @-rmdir $(DESTDIR)$(bindir) local_test: - -run: - @LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./crawl diff --git a/src/libcrawler/GNUmakefile b/src/libcrawler/GNUmakefile index c1e7a7f..e28b916 100755 --- a/src/libcrawler/GNUmakefile +++ b/src/libcrawler/GNUmakefile @@ -11,7 +11,8 @@ INCLUDE_LDFLAGS = \ INCLUDE_DIRS = \ -I. \ -I$(TOPDIR)/include/logger \ - -I$(TOPDIR)/include/util + -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/include/crawler INCLUDE_LIBS = \ diff --git a/src/modules/deduper/null/GNUmakefile b/src/modules/deduper/null/GNUmakefile index 3d1969f..c562fd1 100644 --- a/src/modules/deduper/null/GNUmakefile +++ b/src/modules/deduper/null/GNUmakefile @@ -7,12 +7,13 @@ SUBDIRS = INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/module \ - -I$(TOPDIR)/include/util + -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler diff --git a/src/modules/fetcher/file/GNUmakefile b/src/modules/fetcher/file/GNUmakefile index e081651..aae99c5 100644 --- a/src/modules/fetcher/file/GNUmakefile +++ b/src/modules/fetcher/file/GNUmakefile @@ -7,7 +7,8 @@ SUBDIRS = INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/module \ - -I$(TOPDIR)/include/util + -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ diff --git a/src/modules/fetcher/libfetch/GNUmakefile b/src/modules/fetcher/libfetch/GNUmakefile index 745a1b0..a34a0f8 100644 --- a/src/modules/fetcher/libfetch/GNUmakefile +++ b/src/modules/fetcher/libfetch/GNUmakefile @@ -8,6 +8,7 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/module \ -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/include/crawler \ -I$(TOPDIR)/libfetch INCLUDE_CXXFLAGS = \ diff --git a/src/modules/frontier/memory/GNUmakefile b/src/modules/frontier/memory/GNUmakefile index ddb7ef6..e8f84cb 100644 --- a/src/modules/frontier/memory/GNUmakefile +++ b/src/modules/frontier/memory/GNUmakefile @@ -8,15 +8,14 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ - -I$(TOPDIR)/include/module + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src INCLUDE_LIBS = \ - -lcrawler DYNAMIC_MODULE = \ mod_frontier_memory.so diff --git a/src/modules/processor/htmllinkextract/GNUmakefile b/src/modules/processor/htmllinkextract/GNUmakefile index 139841a..77a9b32 100644 --- a/src/modules/processor/htmllinkextract/GNUmakefile +++ b/src/modules/processor/htmllinkextract/GNUmakefile @@ -9,12 +9,13 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/crawler \ -I$(TOPDIR)/streamhtmlparser INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src \ + -L$(TOPDIR)/src/libcrawler \ -L$(TOPDIR)/streamhtmlparser INCLUDE_LIBS = \ diff --git a/src/modules/typedetect/libmagic/GNUmakefile b/src/modules/typedetect/libmagic/GNUmakefile index 4033cb4..0c4bb64 100644 --- a/src/modules/typedetect/libmagic/GNUmakefile +++ b/src/modules/typedetect/libmagic/GNUmakefile @@ -8,12 +8,13 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ - -I$(TOPDIR)/include/module + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler \ diff --git a/src/modules/urlfilter/chain/GNUmakefile b/src/modules/urlfilter/chain/GNUmakefile index 790c47a..f91c9e6 100644 --- a/src/modules/urlfilter/chain/GNUmakefile +++ b/src/modules/urlfilter/chain/GNUmakefile @@ -8,7 +8,8 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ - -I$(TOPDIR)/include/module + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ diff --git a/src/modules/urlfilter/host/GNUmakefile b/src/modules/urlfilter/host/GNUmakefile index 6029ea2..3b1b616 100644 --- a/src/modules/urlfilter/host/GNUmakefile +++ b/src/modules/urlfilter/host/GNUmakefile @@ -8,7 +8,8 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ - -I$(TOPDIR)/include/module + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ diff --git a/src/modules/urlfilter/protocol/GNUmakefile b/src/modules/urlfilter/protocol/GNUmakefile index 53a56df..b7418c3 100644 --- a/src/modules/urlfilter/protocol/GNUmakefile +++ b/src/modules/urlfilter/protocol/GNUmakefile @@ -8,7 +8,8 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/util \ -I$(TOPDIR)/include/module \ - -I$(TOPDIR)/include/logger + -I$(TOPDIR)/include/logger \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ diff --git a/src/modules/urlnormalizer/googleurl/GNUmakefile b/src/modules/urlnormalizer/googleurl/GNUmakefile index bf95037..530b2ca 100644 --- a/src/modules/urlnormalizer/googleurl/GNUmakefile +++ b/src/modules/urlnormalizer/googleurl/GNUmakefile @@ -8,6 +8,7 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/module \ -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/include/crawler \ -I$(TOPDIR)/googleurl INCLUDE_CXXFLAGS = \ diff --git a/src/modules/urlnormalizer/simpleurl/GNUmakefile b/src/modules/urlnormalizer/simpleurl/GNUmakefile index 3654bd4..4ec83ee 100644 --- a/src/modules/urlnormalizer/simpleurl/GNUmakefile +++ b/src/modules/urlnormalizer/simpleurl/GNUmakefile @@ -7,7 +7,8 @@ SUBDIRS = INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/module \ - -I$(TOPDIR)/include/util + -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ diff --git a/src/modules/urlseen/memory/GNUmakefile b/src/modules/urlseen/memory/GNUmakefile index 2ece46a..c575537 100644 --- a/src/modules/urlseen/memory/GNUmakefile +++ b/src/modules/urlseen/memory/GNUmakefile @@ -8,12 +8,13 @@ INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ - -I$(TOPDIR)/include/module + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/crawler INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ - -L$(TOPDIR)/src + -L$(TOPDIR)/src/libcrawler INCLUDE_LIBS = \ -lcrawler |