From df2c44401f8dd736a903e73813e5f83fb15b36b6 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 5 Sep 2012 18:51:26 +0200 Subject: split away util, logger, and module made a liblogger adapted all tests --- src/GNUmakefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/GNUmakefile') diff --git a/src/GNUmakefile b/src/GNUmakefile index d44dd97..97b934a 100755 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -1,17 +1,23 @@ TOPDIR = .. -SUBDIRS = modules +SUBDIRS = logger modules -include $(TOPDIR)/makefiles/gmake/platform.mk INCLUDE_CPPFLAGS = \ -INCLUDE_LDFLAGS = \ INCLUDE_DIRS = \ - -I. + -I. \ + -I$(TOPDIR)/include/logger \ + -I$(TOPDIR)/include/util \ + -I$(TOPDIR)/include/module + +INCLUDE_LDFLAGS = \ + -L$(TOPDIR)/src/logger INCLUDE_LIBS = \ + -llogger # openssl ifeq ($(WITH_SSL),1) @@ -31,10 +37,6 @@ DYNAMIC_LIB_MINOR = 0 DYNAMIC_LIB_PATCH = 0 CPP_OBJS = \ - Logger.o \ - ConsoleLogSink.o \ - FileLogSink.o \ - SyslogLogSink.o \ URL.o \ MIMEType.o \ SpoolRewindInputStream.o @@ -64,4 +66,4 @@ local_uninstall: local_test: run: - @LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./crawl + @LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./crawl -- cgit v1.2.3-54-g00ecf