Skip to content

Commit ff782dd

Browse files
author
Felipe Zimmerle
committed
Having LDADD and LDFLAGS organized on Makefile.am
1 parent 2b052b0 commit ff782dd

File tree

9 files changed

+164
-92
lines changed

9 files changed

+164
-92
lines changed

‎examples/multiprocess_c/Makefile.am

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@ multi_SOURCES = \
66
multi.c
77

88
multi_LDADD = \
9+
$(SSDEEP_LDADD) \
10+
$(LUA_LDADD) \
11+
$(GLOBAL_LDADD)
12+
13+
multi_LDFLAGS = \
914
-L$(top_builddir)/src/.libs/ \
15+
$(GEOIP_LDFLAGS) \
1016
-lmodsecurity \
1117
-lpthread \
12-
$(YAJL_LDFLAGS) \
13-
$(GEOIP_LDFLAGS) \
14-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
15-
$(LUA_LDFLAGS) $(LUA_LDADD) \
16-
$(GLOBAL_LDADD)
18+
$(LUA_LDFLAGS) \
19+
$(SSDEEP_LDFLAGS) \
20+
$(YAJL_LDFLAGS)
1721

1822
multi_CFLAGS = \
1923
-I$(top_builddir)/headers \

‎examples/reading_logs_via_rule_message/Makefile.am

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@ simple_request_SOURCES = \
66
simple_request.cc
77

88
simple_request_LDADD = \
9-
$(top_builddir)/src/.libs/libmodsecurity.a \
10-
-lpthread \
119
$(CURL_LDADD) \
12-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
13-
$(PCRE_LDADD) \
14-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
15-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
16-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
17-
$(LUA_LDFLAGS) $(LUA_LDADD) \
10+
$(GEOIP_LDADD) \
11+
$(GLOBAL_LDADD) \
1812
$(LIBXML2_LDADD) \
19-
$(GLOBAL_LDADD)
13+
$(LMDB_LDADD) \
14+
$(LUA_LDADD) \
15+
$(PCRE_LDADD) \
16+
$(SSDEEP_LDADD) \
17+
$(top_builddir)/src/.libs/libmodsecurity.a \
18+
$(YAJL_LDADD)
2019

20+
simple_request_LDFLAGS = \
21+
$(GEOIP_LDFLAGS) \
22+
$(LMDB_LDFLAGS) \
23+
-lpthread \
24+
$(LUA_LDFLAGS) \
25+
$(SSDEEP_LDFLAGS) \
26+
$(YAJL_LDFLAGS)
2127

2228
simple_request_CPPFLAGS = \
2329
$(GLOBAL_CFLAGS) \

‎examples/reading_logs_with_offset/Makefile.am

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@ read_SOURCES = \
66
read.cc
77

88
read_LDADD = \
9-
$(top_builddir)/src/.libs/libmodsecurity.a \
109
$(CURL_LDADD) \
11-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
12-
$(PCRE_LDADD) \
13-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
14-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
15-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
16-
$(LUA_LDFLAGS) $(LUA_LDADD) \
10+
$(GEOIP_LDADD) \
11+
$(GLOBAL_LDADD) \
1712
$(LIBXML2_LDADD) \
18-
$(GLOBAL_LDADD)
19-
13+
$(LMDB_LDADD) \
14+
$(LUA_LDADD) \
15+
$(PCRE_LDADD) \
16+
$(SSDEEP_LDADD) \
17+
$(top_builddir)/src/.libs/libmodsecurity.a \
18+
$(YAJL_LDADD)
19+
20+
read_LDFLAGS = \
21+
$(GEOIP_LDFLAGS) \
22+
$(LMDB_LDFLAGS) \
23+
$(LUA_LDFLAGS) \
24+
$(SSDEEP_LDFLAGS) \
25+
$(YAJL_LDFLAGS)
2026

2127
read_CPPFLAGS = \
2228
$(GLOBAL_CFLAGS) \

‎examples/simple_example_using_c/Makefile.am

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ test_SOURCES = \
66
test.c
77

88
test_LDADD = \
9+
$(GLOBAL_LDADD) \
10+
$(LUA_LDADD) \
11+
$(SSDEEP_LDADD)
12+
13+
test_LDFLAGS = \
914
-L$(top_builddir)/src/.libs/ \
10-
-lmodsecurity \
11-
$(YAJL_LDFLAGS) \
1215
$(GEOIP_LDFLAGS) \
13-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
14-
$(LUA_LDFLAGS) $(LUA_LDADD) \
15-
$(GLOBAL_LDADD)
16+
-lmodsecurity \
17+
$(LUA_LDFLAGS) \
18+
$(SSDEEP_LDFLAGS) \
19+
$(YAJL_LDFLAGS)
1620

1721
test_CFLAGS = \
1822
-I$(top_builddir)/headers \

‎examples/using_bodies_in_chunks/Makefile.am

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@ simple_request_SOURCES = \
66
simple_request.cc
77

88
simple_request_LDADD = \
9-
$(top_builddir)/src/.libs/libmodsecurity.a \
10-
-lpthread \
119
$(CURL_LDADD) \
12-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
13-
$(PCRE_LDADD) \
14-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
15-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
16-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
17-
$(LUA_LDFLAGS) $(LUA_LDADD) \
10+
$(GEOIP_LDADD) \
11+
$(GLOBAL_LDADD) \
1812
$(LIBXML2_LDADD) \
19-
$(GLOBAL_LDADD)
13+
$(LMDB_LDADD) \
14+
$(LUA_LDADD) \
15+
$(PCRE_LDADD) \
16+
$(SSDEEP_LDADD) \
17+
$(top_builddir)/src/.libs/libmodsecurity.a \
18+
$(YAJL_LDADD)
2019

20+
simple_request_LDFLAGS = \
21+
$(GEOIP_LDFLAGS) \
22+
$(LMDB_LDFLAGS) \
23+
-lpthread \
24+
$(LUA_LDFLAGS) \
25+
$(SSDEEP_LDFLAGS) \
26+
$(YAJL_LDFLAGS)
2127

2228
simple_request_CPPFLAGS = \
2329
$(GLOBAL_CFLAGS) \
@@ -37,7 +43,6 @@ simple_request_CPPFLAGS = \
3743
$(PCRE_CFLAGS) \
3844
$(LIBXML2_CFLAGS)
3945

40-
4146
MAINTAINERCLEANFILES = \
4247
Makefile.in
4348

‎src/Makefile.am

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ SUBDIRS = \
88
$(MAYBE_PARSER)
99

1010

11-
1211
lib_LTLIBRARIES = libmodsecurity.la
1312
libmodsecurity_ladir = $(prefix)/include
1413
libmodsecurity_includesub_collectiondir = $(pkgincludedir)/collection/
@@ -28,6 +27,7 @@ EXTRA_DIST = \
2827
parser/seclang-scanner.ll \
2928
parser/stack.hh
3029

30+
3131
MAINTAINERCLEANFILES = \
3232
Makefile.in \
3333
config.h.in \
@@ -51,13 +51,11 @@ pkginclude_HEADERS = \
5151
../headers/modsecurity/variable_value.h
5252

5353

54-
5554
libmodsecurity_includesub_collection_HEADERS = \
5655
../headers/modsecurity/collection/collection.h \
5756
../headers/modsecurity/collection/collections.h
5857

5958

60-
6159
libmodsecurity_includesub_actions_HEADERS = \
6260
../headers/modsecurity/actions/action.h
6361

@@ -243,7 +241,6 @@ UTILS = \
243241
utils/shared_files.cc
244242

245243

246-
247244
COLLECTION = \
248245
collection/collections.cc \
249246
collection/backend/in_memory-per_process.cc \
@@ -309,21 +306,31 @@ libmodsecurity_la_CPPFLAGS = \
309306
$(LUA_CFLAGS) \
310307
$(LIBXML2_CFLAGS)
311308

312-
libmodsecurity_la_LIBADD = \
313-
$(GLOBAL_LDADD) \
314-
$(CURL_LDADD) \
315-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
316-
$(PCRE_LDADD) \
317-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
318-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
319-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
320-
$(LUA_LDFLAGS) $(LUA_LDADD) \
321-
$(LIBXML2_LDADD) \
322-
../others/libinjection.la \
323-
../others/libmbedtls.la
324-
325309

326310
libmodsecurity_la_LDFLAGS = \
311+
$(CURL_LDFLAGS) \
312+
$(GEOIP_LDFLAGS) \
313+
$(GLOBAL_LDFLAGS) \
314+
$(LDFLAGS) \
315+
$(LIBXML2_LDFLAGS) \
316+
$(LMDB_LDFLAGS) \
317+
$(LUA_LDFLAGS) \
318+
$(PCRE_LDFLAGS) \
319+
$(SSDEEP_LDFLAGS) \
320+
$(YAJL_LDFLAGS) \
327321
-version-info @MSC_VERSION_INFO@
328322

329323

324+
libmodsecurity_la_LIBADD = \
325+
$(CURL_LDADD) \
326+
$(GEOIP_LDADD) \
327+
$(GLOBAL_LDADD) \
328+
$(LIBXML2_LDADD) \
329+
$(LMDB_LDADD) \
330+
$(LUA_LDADD) \
331+
../others/libinjection.la \
332+
../others/libmbedtls.la \
333+
$(PCRE_LDADD) \
334+
$(SSDEEP_LDADD) \
335+
$(YAJL_LDADD)
336+

‎test/Makefile.am

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,33 @@ unit_tests_SOURCES = \
3131
unit/unit.cc \
3232
unit/unit_test.cc
3333

34+
3435
noinst_HEADERS = \
3536
common/modsecurity_test.cc \
3637
common/*.h \
3738
unit/*.h \
3839
regression/*.h
3940

41+
4042
unit_tests_LDADD = \
41-
$(top_builddir)/src/.libs/libmodsecurity.a \
4243
$(CURL_LDADD) \
43-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
44-
$(PCRE_LDADD) \
45-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
46-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
47-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
48-
$(LUA_LDFLAGS) $(LUA_LDADD) \
44+
$(GEOIP_LDADD) \
45+
$(GLOBAL_LDADD) \
4946
$(LIBXML2_LDADD) \
50-
$(GLOBAL_LDADD)
47+
$(LMDB_LDADD) \
48+
$(LUA_LDADD) \
49+
$(PCRE_LDADD) \
50+
$(SSDEEP_LDADD) \
51+
$(top_builddir)/src/.libs/libmodsecurity.a \
52+
$(YAJL_LDADD)
53+
54+
55+
unit_tests_LDFLAG = \
56+
$(GEOIP_LDFLAGS) \
57+
$(LMDB_LDFLAGS) \
58+
$(LUA_LDFLAGS) \
59+
$(SSDEEP_LDFLAGS) \
60+
$(YAJL_LDFLAGS)
5161

5262

5363
unit_tests_CPPFLAGS = \
@@ -80,14 +90,22 @@ regression_tests_SOURCES = \
8090
regression_tests_LDADD = \
8191
$(top_builddir)/src/.libs/libmodsecurity.a \
8292
$(CURL_LDADD) \
83-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
84-
$(PCRE_LDADD) \
85-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
86-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
87-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
88-
$(LUA_LDFLAGS) $(LUA_LDADD) \
93+
$(GEOIP_LDADD) \
94+
$(GLOBAL_LDADD) \
8995
$(LIBXML2_LDADD) \
90-
$(GLOBAL_LDADD)
96+
$(LMDB_LDADD) \
97+
$(LUA_LDADD) \
98+
$(PCRE_LDADD) \
99+
$(SSDEEP_LDADD) \
100+
$(YAJL_LDADD)
101+
102+
103+
regression_tests_LDFLAGS = \
104+
$(GEOIP_LDFLAGS) \
105+
$(YAJL_LDFLAGS) \
106+
$(LMDB_LDFLAGS) \
107+
$(SSDEEP_LDFLAGS) \
108+
$(LUA_LDFLAGS)
91109

92110

93111
regression_tests_CPPFLAGS = \
@@ -117,17 +135,23 @@ rules_optimization_SOURCES = \
117135
optimization/optimization.cc
118136

119137
rules_optimization_LDADD = \
120-
$(top_builddir)/src/.libs/libmodsecurity.a \
121138
$(CURL_LDADD) \
122-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
123-
$(PCRE_LDADD) \
124-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
125-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
126-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
127-
$(LUA_LDFLAGS) $(LUA_LDADD) \
139+
$(GEOIP_LDADD) \
140+
$(GLOBAL_LDADD) \
128141
$(LIBXML2_LDADD) \
129-
$(GLOBAL_LDADD)
130-
142+
$(LMDB_LDADD) \
143+
$(LUA_LDADD) \
144+
$(PCRE_LDADD) \
145+
$(SSDEEP_LDADD) \
146+
$(top_builddir)/src/.libs/libmodsecurity.a \
147+
$(YAJL_LDADD)
148+
149+
rules_optimization_LDFLAGS = \
150+
$(GEOIP_LDFLAGS) \
151+
$(LMDB_LDFLAGS) \
152+
$(LUA_LDFLAGS) \
153+
$(SSDEEP_LDFLAGS) \
154+
$(YAJL_LDFLAGS)
131155

132156
rules_optimization_CPPFLAGS = \
133157
-std=c++11 \

‎test/benchmark/Makefile.am

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@ benchmark_SOURCES = \
88
benchmark_LDADD = \
99
$(top_builddir)/src/.libs/libmodsecurity.a \
1010
$(CURL_LDADD) \
11-
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
11+
$(GEOIP_LDADD) \
1212
$(PCRE_LDADD) \
13-
$(YAJL_LDFLAGS) $(YAJL_LDADD) \
14-
$(LMDB_LDFLAGS) $(LMDB_LDADD) \
15-
$(SSDEEP_LDFLAGS) $(SSDEEP_LDADD) \
16-
$(LUA_LDFLAGS) $(LUA_LDADD) \
13+
$(YAJL_LDADD) \
14+
$(LMDB_LDADD) \
15+
$(SSDEEP_LDADD) \
16+
$(LUA_LDADD) \
1717
$(LIBXML2_LDADD) \
1818
$(GLOBAL_LDADD)
1919

20+
benchmark_LDFLAGS = \
21+
$(top_builddir)/src/.libs/libmodsecurity.a \
22+
$(GEOIP_LDFLAGS) \
23+
$(YAJL_LDFLAGS) \
24+
$(LMDB_LDFLAGS) \
25+
$(SSDEEP_LDFLAGS) \
26+
$(LUA_LDFLAGS)
27+
2028
benchmark_CPPFLAGS = \
2129
-std=c++11 \
2230
-I$(top_builddir)/headers \

0 commit comments

Comments
 (0)