Having LDADD and LDFLAGS organized on Makefile.am

This commit is contained in:
Felipe Zimmerle 2018-02-21 14:24:21 -03:00
parent 2b052b0edb
commit ff782ddfa4
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
9 changed files with 162 additions and 90 deletions

View File

@ -6,14 +6,18 @@ multi_SOURCES = \
multi.c multi.c
multi_LDADD = \ multi_LDADD = \
$(SSDEEP_LDADD) \
$(LUA_LDADD) \
$(GLOBAL_LDADD)
multi_LDFLAGS = \
-L$(top_builddir)/src/.libs/ \ -L$(top_builddir)/src/.libs/ \
$(GEOIP_LDFLAGS) \
-lmodsecurity \ -lmodsecurity \
-lpthread \ -lpthread \
$(YAJL_LDFLAGS) \ $(LUA_LDFLAGS) \
$(GEOIP_LDFLAGS) \ $(SSDEEP_LDFLAGS) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \ $(YAJL_LDFLAGS)
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(GLOBAL_LDADD)
multi_CFLAGS = \ multi_CFLAGS = \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \

View File

@ -6,18 +6,24 @@ simple_request_SOURCES = \
simple_request.cc simple_request.cc
simple_request_LDADD = \ simple_request_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \
-lpthread \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(GLOBAL_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(LMDB_LDADD) \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(YAJL_LDADD)
simple_request_LDFLAGS = \
$(GEOIP_LDFLAGS) \
$(LMDB_LDFLAGS) \
-lpthread \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
simple_request_CPPFLAGS = \ simple_request_CPPFLAGS = \
$(GLOBAL_CFLAGS) \ $(GLOBAL_CFLAGS) \

View File

@ -6,17 +6,23 @@ read_SOURCES = \
read.cc read.cc
read_LDADD = \ read_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(GLOBAL_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(LMDB_LDADD) \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(YAJL_LDADD)
read_LDFLAGS = \
$(GEOIP_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
read_CPPFLAGS = \ read_CPPFLAGS = \
$(GLOBAL_CFLAGS) \ $(GLOBAL_CFLAGS) \

View File

@ -6,13 +6,17 @@ test_SOURCES = \
test.c test.c
test_LDADD = \ test_LDADD = \
$(GLOBAL_LDADD) \
$(LUA_LDADD) \
$(SSDEEP_LDADD)
test_LDFLAGS = \
-L$(top_builddir)/src/.libs/ \ -L$(top_builddir)/src/.libs/ \
-lmodsecurity \
$(YAJL_LDFLAGS) \
$(GEOIP_LDFLAGS) \ $(GEOIP_LDFLAGS) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \ -lmodsecurity \
$(LUA_LDFLAGS) $(LUA_LDADD) \ $(LUA_LDFLAGS) \
$(GLOBAL_LDADD) $(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
test_CFLAGS = \ test_CFLAGS = \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \

View File

@ -6,18 +6,24 @@ simple_request_SOURCES = \
simple_request.cc simple_request.cc
simple_request_LDADD = \ simple_request_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \
-lpthread \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(GLOBAL_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(LMDB_LDADD) \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(YAJL_LDADD)
simple_request_LDFLAGS = \
$(GEOIP_LDFLAGS) \
$(LMDB_LDFLAGS) \
-lpthread \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
simple_request_CPPFLAGS = \ simple_request_CPPFLAGS = \
$(GLOBAL_CFLAGS) \ $(GLOBAL_CFLAGS) \
@ -37,7 +43,6 @@ simple_request_CPPFLAGS = \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
Makefile.in Makefile.in

View File

@ -8,7 +8,6 @@ SUBDIRS = \
$(MAYBE_PARSER) $(MAYBE_PARSER)
lib_LTLIBRARIES = libmodsecurity.la lib_LTLIBRARIES = libmodsecurity.la
libmodsecurity_ladir = $(prefix)/include libmodsecurity_ladir = $(prefix)/include
libmodsecurity_includesub_collectiondir = $(pkgincludedir)/collection/ libmodsecurity_includesub_collectiondir = $(pkgincludedir)/collection/
@ -28,6 +27,7 @@ EXTRA_DIST = \
parser/seclang-scanner.ll \ parser/seclang-scanner.ll \
parser/stack.hh parser/stack.hh
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
Makefile.in \ Makefile.in \
config.h.in \ config.h.in \
@ -51,13 +51,11 @@ pkginclude_HEADERS = \
../headers/modsecurity/variable_value.h ../headers/modsecurity/variable_value.h
libmodsecurity_includesub_collection_HEADERS = \ libmodsecurity_includesub_collection_HEADERS = \
../headers/modsecurity/collection/collection.h \ ../headers/modsecurity/collection/collection.h \
../headers/modsecurity/collection/collections.h ../headers/modsecurity/collection/collections.h
libmodsecurity_includesub_actions_HEADERS = \ libmodsecurity_includesub_actions_HEADERS = \
../headers/modsecurity/actions/action.h ../headers/modsecurity/actions/action.h
@ -243,7 +241,6 @@ UTILS = \
utils/shared_files.cc utils/shared_files.cc
COLLECTION = \ COLLECTION = \
collection/collections.cc \ collection/collections.cc \
collection/backend/in_memory-per_process.cc \ collection/backend/in_memory-per_process.cc \
@ -309,21 +306,31 @@ libmodsecurity_la_CPPFLAGS = \
$(LUA_CFLAGS) \ $(LUA_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)
libmodsecurity_la_LIBADD = \
$(GLOBAL_LDADD) \
$(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \
../others/libinjection.la \
../others/libmbedtls.la
libmodsecurity_la_LDFLAGS = \ libmodsecurity_la_LDFLAGS = \
$(CURL_LDFLAGS) \
$(GEOIP_LDFLAGS) \
$(GLOBAL_LDFLAGS) \
$(LDFLAGS) \
$(LIBXML2_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(PCRE_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS) \
-version-info @MSC_VERSION_INFO@ -version-info @MSC_VERSION_INFO@
libmodsecurity_la_LIBADD = \
$(CURL_LDADD) \
$(GEOIP_LDADD) \
$(GLOBAL_LDADD) \
$(LIBXML2_LDADD) \
$(LMDB_LDADD) \
$(LUA_LDADD) \
../others/libinjection.la \
../others/libmbedtls.la \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(YAJL_LDADD)

View File

@ -31,23 +31,33 @@ unit_tests_SOURCES = \
unit/unit.cc \ unit/unit.cc \
unit/unit_test.cc unit/unit_test.cc
noinst_HEADERS = \ noinst_HEADERS = \
common/modsecurity_test.cc \ common/modsecurity_test.cc \
common/*.h \ common/*.h \
unit/*.h \ unit/*.h \
regression/*.h regression/*.h
unit_tests_LDADD = \ unit_tests_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(GLOBAL_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(LMDB_LDADD) \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(YAJL_LDADD)
unit_tests_LDFLAG = \
$(GEOIP_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
unit_tests_CPPFLAGS = \ unit_tests_CPPFLAGS = \
@ -80,14 +90,22 @@ regression_tests_SOURCES = \
regression_tests_LDADD = \ regression_tests_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(GLOBAL_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(LMDB_LDADD) \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(YAJL_LDADD)
regression_tests_LDFLAGS = \
$(GEOIP_LDFLAGS) \
$(YAJL_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(LUA_LDFLAGS)
regression_tests_CPPFLAGS = \ regression_tests_CPPFLAGS = \
@ -117,17 +135,23 @@ rules_optimization_SOURCES = \
optimization/optimization.cc optimization/optimization.cc
rules_optimization_LDADD = \ rules_optimization_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(GLOBAL_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(LMDB_LDADD) \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(YAJL_LDADD)
rules_optimization_LDFLAGS = \
$(GEOIP_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
rules_optimization_CPPFLAGS = \ rules_optimization_CPPFLAGS = \
-std=c++11 \ -std=c++11 \

View File

@ -8,15 +8,23 @@ benchmark_SOURCES = \
benchmark_LDADD = \ benchmark_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \ $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \ $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \ $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(GLOBAL_LDADD)
benchmark_LDFLAGS = \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(GEOIP_LDFLAGS) \
$(YAJL_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(LUA_LDFLAGS)
benchmark_CPPFLAGS = \ benchmark_CPPFLAGS = \
-std=c++11 \ -std=c++11 \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \

View File

@ -6,16 +6,24 @@ modsec_rules_check_SOURCES = \
rules-check.cc rules-check.cc
modsec_rules_check_LDADD = \ modsec_rules_check_LDADD = \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(GLOBAL_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
$(LUA_LDFLAGS) $(LUA_LDADD) \
$(LIBXML2_LDADD) \ $(LIBXML2_LDADD) \
$(GLOBAL_LDADD) $(LMDB_LDADD) \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \
$(YAJL_LDADD)
modsec_rules_check_LDFLAGS = \
$(GEOIP_LDFLAGS) \
$(LDFLAGS) \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
modsec_rules_check_CPPFLAGS = \ modsec_rules_check_CPPFLAGS = \
-std=c++11 \ -std=c++11 \