--- src/Makefile.am	2005-05-06 05:43:41.000000000 +0200
+++ src/Makefile.am.oden	2008-07-20 14:10:20.000000000 +0200
@@ -21,108 +21,108 @@
 #	./ftbuild.sh
 
 flow_mask_SOURCES = flow-mask.c ftbuild.h
-flow_mask_LDFLAGS = -L../lib
-flow_mask_LDADD =  -lft
+flow_mask_LDFLAGS = ../lib/libft.la
+flow_mask_LDADD = 
 flow_mask_DEPENDENCIES = ftbuild.h
 
 flow_report_SOURCES = flow-report.c ftbuild.h
-flow_report_LDFLAGS = -L../lib
-flow_report_LDADD =  -lft
+flow_report_LDFLAGS = ../lib/libft.la
+flow_report_LDADD = 
 flow_report_DEPENDENCIES = ftbuild.h
 
 flow_nfilter_SOURCES = flow-nfilter.c ftbuild.h
-flow_nfilter_LDFLAGS = -L../lib
-flow_nfilter_LDADD =  -lft
+flow_nfilter_LDFLAGS = ../lib/libft.la
+flow_nfilter_LDADD = 
 flow_nfilter_DEPENDENCIES = ftbuild.h
 
 flow_import_SOURCES = flow-import.c ftbuild.h
-flow_import_LDFLAGS = -L../lib
-flow_import_LDADD =  -lft
+flow_import_LDFLAGS = ../lib/libft.la
+flow_import_LDADD = 
 flow_import_DEPENDENCIES = ftbuild.h
 
 flow_merge_SOURCES = flow-merge.c
-flow_merge_LDFLAGS = -L../lib
-flow_merge_LDADD =  -lft
+flow_merge_LDFLAGS = ../lib/libft.la
+flow_merge_LDADD = 
 flow_merge_DEPENDENCIES = ftbuild.h
 
 flow_capture_SOURCES = flow-capture.c
-flow_capture_LDFLAGS = -L../lib
-flow_capture_LDADD =  -lft @CRYPTOLIB@
+flow_capture_LDFLAGS = ../lib/libft.la
+flow_capture_LDADD = @CRYPTOLIB@
 flow_capture_DEPENDENCIES = ftbuild.h
 
 flow_cat_SOURCES = flow-cat.c
-flow_cat_LDFLAGS = -L../lib
-flow_cat_LDADD =  -lft
+flow_cat_LDFLAGS = ../lib/libft.la
+flow_cat_LDADD = 
 flow_cat_DEPENDENCIES = ftbuild.h
 
 flow_stat_SOURCES = flow-stat.c
-flow_stat_LDFLAGS = -L../lib
-flow_stat_LDADD =  -lft
+flow_stat_LDFLAGS = ../lib/libft.la
+flow_stat_LDADD = 
 flow_stat_DEPENDENCIES = ftbuild.h
 
 flow_print_SOURCES = flow-print.c
-flow_print_LDFLAGS = -L../lib
-flow_print_LDADD =  -lft
+flow_print_LDFLAGS = ../lib/libft.la
+flow_print_LDADD = 
 flow_print_DEPENDENCIES = ftbuild.h
 
 flow_dscan_SOURCES = flow-dscan.c
-flow_dscan_LDFLAGS = -L../lib
-flow_dscan_LDADD =  -lft
+flow_dscan_LDFLAGS = ../lib/libft.la
+flow_dscan_LDADD = 
 flow_dscan_DEPENDENCIES = ftbuild.h
 
 flow_fanout_SOURCES = flow-fanout.c
-flow_fanout_LDFLAGS = -L../lib
-flow_fanout_LDADD =  -lft
+flow_fanout_LDFLAGS = ../lib/libft.la
+flow_fanout_LDADD = 
 flow_fanout_DEPENDENCIES = ftbuild.h
 
 flow_send_SOURCES = flow-send.c
-flow_send_LDFLAGS = -L../lib
-flow_send_LDADD =  -lft
+flow_send_LDFLAGS = ../lib/libft.la
+flow_send_LDADD = 
 flow_send_DEPENDENCIES = ftbuild.h
 
 flow_receive_SOURCES = flow-receive.c
-flow_receive_LDFLAGS = -L../lib
-flow_receive_LDADD =  -lft
+flow_receive_LDFLAGS = ../lib/libft.la
+flow_receive_LDADD = 
 flow_receive_DEPENDENCIES = ftbuild.h
 
 flow_gen_SOURCES = flow-gen.c
-flow_gen_LDFLAGS = -L../lib
-flow_gen_LDADD =  -lft
+flow_gen_LDFLAGS = ../lib/libft.la
+flow_gen_LDADD = 
 flow_gen_DEPENDENCIES = ftbuild.h
 
 flow_expire_SOURCES = flow-expire.c
-flow_expire_LDFLAGS = -L../lib
-flow_expire_LDADD =  -lft
+flow_expire_LDFLAGS = ../lib/libft.la
+flow_expire_LDADD = 
 flow_expire_DEPENDENCIES = ftbuild.h
 
 flow_filter_SOURCES = flow-filter.c aclyacc.y acllex.l acl2.c 
-flow_filter_LDFLAGS = -L../lib
-flow_filter_LDADD =  -lft @LEXLIB@ @YLIB@
+flow_filter_LDFLAGS = ../lib/libft.la
+flow_filter_LDADD = @LEXLIB@ @YLIB@
 flow_filter_DEPENDENCIES = ftbuild.h
 
 flow_export_SOURCES = flow-export.c
-flow_export_LDFLAGS = -L../lib
+flow_export_LDFLAGS = ../lib/libft.la
 flow_export_CFLAGS = @MYSQLCFLAGS@ @PGSQLCFLAGS@
-flow_export_LDADD =  -lft @MYSQLLIB@ @PGSQLLIB@
+flow_export_LDADD = @MYSQLLIB@ @PGSQLLIB@
 flow_export_DEPENDENCIES = ftbuild.h
 
 flow_header_SOURCES = flow-header.c
-flow_header_LDFLAGS = -L../lib
-flow_header_LDADD =  -lft
+flow_header_LDFLAGS = ../lib/libft.la
+flow_header_LDADD = 
 flow_header_DEPENDENCIES = ftbuild.h
 
 flow_split_SOURCES = flow-split.c
-flow_split_LDFLAGS = -L../lib
-flow_split_LDADD =  -lft
+flow_split_LDFLAGS = ../lib/libft.la
+flow_split_LDADD = 
 flow_split_DEPENDENCIES = ftbuild.h
 
 flow_xlate_SOURCES = flow-xlate.c
-flow_xlate_LDFLAGS = -L../lib
-flow_xlate_LDADD =  -lft @CRYPTOLIB@
+flow_xlate_LDFLAGS = ../lib/libft.la
+flow_xlate_LDADD = @CRYPTOLIB@
 flow_xlate_DEPENDENCIES = ftbuild.h
 
 flow_tag_SOURCES = flow-tag.c
-flow_tag_LDFLAGS = -L../lib
-flow_tag_LDADD =  -lft
+flow_tag_LDFLAGS = ../lib/libft.la
+flow_tag_LDADD = 
 flow_tag_DEPENDENCIES = ftbuild.h