prefer dynamic to static linking (linking a non-PIC .a library

into a module is illegal, but on Linux!)

13 files changed, 41 insertions, 27 deletions

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 119ec2b..592a6a0 100755
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -23,7 +23,12 @@ INCLUDE_LIBS += \
 	$(OPENSSL_LIBS)
 endif
 
-LOCAL_STATIC_LIB_OBJS = \
+DYNAMIC_LIB = libcrawler.so
+DYNAMIC_LIB_MAJOR = 0
+DYNAMIC_LIB_MINOR = 0
+DYNAMIC_LIB_PATCH = 0
+
+CPP_OBJS = \
 	Logger.o \
 	ConsoleLogSink.o \
 	FileLogSink.o \
@@ -31,23 +36,14 @@ LOCAL_STATIC_LIB_OBJS = \
 	MIMEType.o \
 	SpoolRewindInputStream.o
 
-CPP_OBJS = \
-	$(LOCAL_STATIC_LIB_OBJS)
-
-LOCAL_STATIC_LIB = \
-	libcrawler.a
-
 CPP_BINS = \
 	crawl$(EXE)
 
 -include $(TOPDIR)/makefiles/gmake/sub.mk
 
-local_all: $(LOCAL_STATIC_LIB)
-
-$(LOCAL_STATIC_LIB): $(LOCAL_STATIC_LIB_OBJS)
-	ar rcs $(LOCAL_STATIC_LIB) $(LOCAL_STATIC_LIB_OBJS)
+local_all:
 
-modules: $(LOCAL_STATIC_LIB)
+modules: $(DYNAMIC_LIB)
 
 local_clean:
 	@-rm -f $(LOCAL_STATIC_LIB)
@@ -63,3 +59,6 @@ local_uninstall:
 	@-rmdir $(DESTDIR)$(bindir)
 
 local_test:
+
+run:
+	LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./crawl
diff --git a/src/modules/deduper/null/GNUmakefile b/src/modules/deduper/null/GNUmakefile
index b7c1686..7bbfd49 100644
--- a/src/modules/deduper/null/GNUmakefile
+++ b/src/modules/deduper/null/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_deduper_null.so
diff --git a/src/modules/fetcher/file/GNUmakefile b/src/modules/fetcher/file/GNUmakefile
index 5432203..1714b3a 100644
--- a/src/modules/fetcher/file/GNUmakefile
+++ b/src/modules/fetcher/file/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_fetcher_file.so
diff --git a/src/modules/fetcher/libfetch/GNUmakefile b/src/modules/fetcher/libfetch/GNUmakefile
index 84635ee..7c77a29 100644
--- a/src/modules/fetcher/libfetch/GNUmakefile
+++ b/src/modules/fetcher/libfetch/GNUmakefile
@@ -11,10 +11,12 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src \
+	-L$(TOPDIR)/libfetch
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a \
-	$(TOPDIR)/libfetch/libfetch.a
+	-lcrawler \
+	-lfetch
 
 DYNAMIC_MODULE = \
 	mod_fetcher_libfetch.so
diff --git a/src/modules/frontier/memory/GNUmakefile b/src/modules/frontier/memory/GNUmakefile
index effa93d..368b37e 100644
--- a/src/modules/frontier/memory/GNUmakefile
+++ b/src/modules/frontier/memory/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_frontier_memory.so
diff --git a/src/modules/processor/htmllinkextract/GNUmakefile b/src/modules/processor/htmllinkextract/GNUmakefile
index 87ef459..a9919d0 100644
--- a/src/modules/processor/htmllinkextract/GNUmakefile
+++ b/src/modules/processor/htmllinkextract/GNUmakefile
@@ -11,10 +11,12 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src \
+	-L$(TOPDIR)/streamhtmlparser
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a \
-	$(TOPDIR)/streamhtmlparser/libstreamhtmlparser.a
+	-lcrawler \
+	-lstreamhtmlparser
 
 DYNAMIC_MODULE = \
 	mod_processor_htmllinkextract.so
diff --git a/src/modules/typedetect/libmagic/GNUmakefile b/src/modules/typedetect/libmagic/GNUmakefile
index 7ac0357..2bd823f 100644
--- a/src/modules/typedetect/libmagic/GNUmakefile
+++ b/src/modules/typedetect/libmagic/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a \
+	-lcrawler \
 	-lmagic
 
 DYNAMIC_MODULE = \
diff --git a/src/modules/urlfilter/chain/GNUmakefile b/src/modules/urlfilter/chain/GNUmakefile
index 2ed1c27..50ce867 100644
--- a/src/modules/urlfilter/chain/GNUmakefile
+++ b/src/modules/urlfilter/chain/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_urlfilter_chain.so
diff --git a/src/modules/urlfilter/host/GNUmakefile b/src/modules/urlfilter/host/GNUmakefile
index 8477730..f307eb8 100644
--- a/src/modules/urlfilter/host/GNUmakefile
+++ b/src/modules/urlfilter/host/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_urlfilter_host.so
diff --git a/src/modules/urlfilter/protocol/GNUmakefile b/src/modules/urlfilter/protocol/GNUmakefile
index 897a71b..a4b976c 100644
--- a/src/modules/urlfilter/protocol/GNUmakefile
+++ b/src/modules/urlfilter/protocol/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_urlfilter_protocol.so
diff --git a/src/modules/urlnormalizer/googleurl/GNUmakefile b/src/modules/urlnormalizer/googleurl/GNUmakefile
index 14cd2c1..9bafab5 100644
--- a/src/modules/urlnormalizer/googleurl/GNUmakefile
+++ b/src/modules/urlnormalizer/googleurl/GNUmakefile
@@ -11,10 +11,12 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/googleurl \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/googleurl/libgoogleurl.a \
-	$(TOPDIR)/src/libcrawler.a \
+	-lgoogleurl \
+	-lcrawler \
 	-licui18n -licuuc
 
 DYNAMIC_MODULE = \
diff --git a/src/modules/urlnormalizer/simpleurl/GNUmakefile b/src/modules/urlnormalizer/simpleurl/GNUmakefile
index c388c43..71d516e 100644
--- a/src/modules/urlnormalizer/simpleurl/GNUmakefile
+++ b/src/modules/urlnormalizer/simpleurl/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_urlnormalizer_simple.so
diff --git a/src/modules/urlseen/memory/GNUmakefile b/src/modules/urlseen/memory/GNUmakefile
index 440b498..db5e428 100644
--- a/src/modules/urlseen/memory/GNUmakefile
+++ b/src/modules/urlseen/memory/GNUmakefile
@@ -10,9 +10,10 @@ INCLUDE_DIRS = \
 INCLUDE_CXXFLAGS = \
 
 INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	-lcrawler
 
 DYNAMIC_MODULE = \
 	mod_urlseen_memory.so