github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix pcre cflags variable and adds LDFLAGS for dependencies

Browse Source
This commit is contained in:
Ivan Prokhorov 2015-11-11 10:29:57 +02:00 committed by Felipe Zimmerle
parent 47233adf3b
commit 7a300eb945
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/simple_example_using_c/Makefile.am
View File

@ -6,7 +6,7 @@ test_SOURCES = \
test.c test.c
test_LDADD = \ test_LDADD = \
-L$(top_builddir)/src/.libs/ -lmodsecurity -L$(top_builddir)/src/.libs/ -lmodsecurity $(YAJL_LDFLAGS) $(GEOIP_LDFLAGS)
test_CFLAGS = \ test_CFLAGS = \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \

4
src/Makefile.am
View File

@ -217,12 +217,12 @@ libmodsecurity_la_CPPFLAGS = \
-I ../headers \ -I ../headers \
$(GEOIP_CFLAGS) \ $(GEOIP_CFLAGS) \
$(MODSEC_NO_LOGS) \ $(MODSEC_NO_LOGS) \
$(PCRE_CPPFLAGS) $(PCRE_CFLAGS)
libmodsecurity_la_LIBADD = \ libmodsecurity_la_LIBADD = \
-lrt \ -lrt \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
@LEXLIB@ \ @LEXLIB@ \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDADD) $(YAJL_LDADD)

18
test/Makefile.am
View File

@ -27,9 +27,9 @@ unit_tests_LDADD = \
-lrt \ -lrt \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDADD) $(YAJL_LDFLAGS) $(YAJL_LDADD)
unit_tests_CPPFLAGS = \ unit_tests_CPPFLAGS = \
-std=c++11 \ -std=c++11 \
@ -41,7 +41,7 @@ unit_tests_CPPFLAGS = \
$(CURL_CFLAGS) \ $(CURL_CFLAGS) \
$(MODSEC_NO_LOGS) \ $(MODSEC_NO_LOGS) \
$(GEOIP_CFLAGS) \ $(GEOIP_CFLAGS) \
$(PCRE_CPPFLAGS) \ $(PCRE_CFLAGS) \
$(YAJL_CFLAGS) $(YAJL_CFLAGS)
@ -56,9 +56,9 @@ regression_tests_LDADD = \
-lrt \ -lrt \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDADD) $(YAJL_LDFLAGS) $(YAJL_LDADD)
regression_tests_CPPFLAGS = \ regression_tests_CPPFLAGS = \
-std=c++11 \ -std=c++11 \
@ -70,7 +70,7 @@ regression_tests_CPPFLAGS = \
$(CURL_CFLAGS) \ $(CURL_CFLAGS) \
$(MODSEC_NO_LOGS) \ $(MODSEC_NO_LOGS) \
$(GEOIP_CFLAGS) \ $(GEOIP_CFLAGS) \
$(PCRE_CPPFLAGS) \ $(PCRE_CFLAGS) \
$(YAJL_CFLAGS) $(YAJL_CFLAGS)
@ -83,9 +83,9 @@ rules_optimization_LDADD = \
-lrt \ -lrt \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDADD) $(YAJL_LDFLAGS) $(YAJL_LDADD)
rules_optimization_CPPFLAGS = \ rules_optimization_CPPFLAGS = \
-std=c++11 \ -std=c++11 \
@ -97,5 +97,5 @@ rules_optimization_CPPFLAGS = \
$(CURL_CFLAGS) \ $(CURL_CFLAGS) \
$(MODSEC_NO_LOGS) \ $(MODSEC_NO_LOGS) \
$(GEOIP_CFLAGS) \ $(GEOIP_CFLAGS) \
$(PCRE_CPPFLAGS) \ $(PCRE_CFLAGS) \
$(YAJL_CFLAGS) $(YAJL_CFLAGS)

6
test/benchmark/Makefile.am
View File

@ -9,14 +9,14 @@ benchmark_LDADD = \
-lrt \ -lrt \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDADD) $(YAJL_LDFLAGS) $(YAJL_LDADD)
benchmark_CPPFLAGS = \ benchmark_CPPFLAGS = \
-std=c++11 \ -std=c++11 \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
$(PCRE_CPPFLAGS) $(PCRE_CFLAGS)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \