Refactoring: Renames RulesProperties to RulesSetProperties

test/Makefile.am

@@ -42,7 +42,6 @@ noinst_HEADERS = \
 
 
 unit_tests_LDADD = \
-	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
 	$(GEOIP_LDADD) \
 	$(MAXMIND_LDADD) \
@@ -56,7 +55,12 @@ unit_tests_LDADD = \
 
 
 unit_tests_LDFLAGS = \
+	-L$(top_builddir)/src/.libs/ \
 	$(GEOIP_LDFLAGS) \
+	-lmodsecurity \
+	-lpthread \
+	-lm \
+	-lstdc++ \
 	$(MAXMIND_LDFLAGS) \
 	$(LMDB_LDFLAGS) \
 	$(LUA_LDFLAGS) \
@@ -92,7 +96,6 @@ regression_tests_SOURCES = \
         regression/custom_debug_log.cc
 
 regression_tests_LDADD = \
-	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
 	$(GEOIP_LDADD) \
 	$(MAXMIND_LDADD) \
@@ -106,7 +109,12 @@ regression_tests_LDADD = \
 
 
 regression_tests_LDFLAGS = \
+	-L$(top_builddir)/src/.libs/ \
 	$(GEOIP_LDFLAGS) \
+	-lmodsecurity \
+	-lpthread \
+	-lm \
+	-lstdc++ \
 	$(MAXMIND_LDFLAGS) \
 	$(YAJL_LDFLAGS) \
 	$(LMDB_LDFLAGS) \
@@ -141,7 +149,6 @@ rules_optimization_SOURCES = \
         optimization/optimization.cc
 
 rules_optimization_LDADD = \
-	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
 	$(GEOIP_LDADD) \
 	$(MAXMIND_LDADD) \
@@ -154,7 +161,12 @@ rules_optimization_LDADD = \
 	$(YAJL_LDADD)
 
 rules_optimization_LDFLAGS = \
+	-L$(top_builddir)/src/.libs/ \
 	$(GEOIP_LDFLAGS) \
+	-lmodsecurity \
+	-lpthread \
+	-lm \
+	-lstdc++ \
 	$(MAXMIND_LDFLAGS) \
 	$(LMDB_LDFLAGS) \
 	$(LUA_LDFLAGS) \

test/benchmark/Makefile.am

@@ -6,7 +6,6 @@ benchmark_SOURCES = \
         benchmark.cc
 
 benchmark_LDADD = \
-	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
 	$(GEOIP_LDADD) \
 	$(MAXMIND_LDADD) \
@@ -19,7 +18,12 @@ benchmark_LDADD = \
 	$(GLOBAL_LDADD)
 
 benchmark_LDFLAGS = \
-	$(top_builddir)/src/.libs/libmodsecurity.a \
+	-L$(top_builddir)/src/.libs/ \
+	$(GEOIP_LDFLAGS) \
+	-lmodsecurity \
+	-lpthread \
+	-lm \
+	-lstdc++ \
 	$(GEOIP_LDFLAGS) \
 	$(MAXMIND_LDFLAGS) \
 	$(YAJL_LDFLAGS) \

test/optimization/optimization.cc

@@ -20,12 +20,12 @@
 #include <string>
 #include <list>
 
+#include "modsecurity/rules_set_properties.h"
 #include "modsecurity/rules_set.h"
 #include "modsecurity/modsecurity.h"
 #include "src/utils/system.h"
 #include "src/parser/driver.h"
 #include "src/utils/https_client.h"
-#include "modsecurity/rules_properties.h"
 #include "modsecurity/transaction.h"
 
 void print_help() {