Skip to content

Commit 1cde4d2

Browse files
author
Felipe Zimmerle
committed
Organizes all Makefile.am
Now using one file per line (sorted). This is the better way to handle it, since it reduces the possibility of merge conflicts.
1 parent 351b9cc commit 1cde4d2

File tree

7 files changed

+325
-169
lines changed

7 files changed

+325
-169
lines changed

‎Makefile.am‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,31 @@ CLEANFILES =
55
MAINTAINERCLEANFILES =
66

77
CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
8-
   tests/regression/server_root/logs/*.log
8+
tests/regression/server_root/logs/*.log
99

1010
MAINTAINERCLEANFILES += $(CLEANFILES) \
11-
Makefile.in \
12-
aclocal.m4 \
13-
alp2/Makefile.in \
14-
apache2/Makefile.in \
15-
build/config.guess \
16-
build/config.sub \
17-
build/depcomp \
18-
build/libtool.m4 \
19-
build/ltmain.sh \
20-
build/ltoptions.m4 \
21-
build/ltsugar.m4 \
22-
build/ltversion.m4 \
23-
build/lt~obsolete.m4 \
24-
build/missing \
25-
configure \
26-
ext/Makefile.in \
27-
mlogc/Makefile.in \
28-
modsecurity_config_auto.h.in~ \
29-
config.log \
30-
Makefile \
31-
config.status
32-
33-
# Alias for "check"
11+
aclocal.m4 \
12+
alp2/Makefile.in \
13+
apache2/Makefile.in \
14+
build/config.guess \
15+
build/config.sub \
16+
build/depcomp \
17+
build/libtool.m4 \
18+
build/ltmain.sh \
19+
build/lt~obsolete.m4 \
20+
build/ltoptions.m4 \
21+
build/ltsugar.m4 \
22+
build/ltversion.m4 \
23+
build/missing \
24+
config.log \
25+
config.status \
26+
configure \
27+
ext/Makefile.in \
28+
Makefile \
29+
Makefile.in \
30+
mlogc/Makefile.in \
31+
modsecurity_config_auto.h.in~
32+
3433
test: check
3534

3635
test-regression:

‎alp2/Makefile.am‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
lib_LTLIBRARIES = libalp2.la
2-
include_HEADERS = alp2.h alp2_pp.h
32

4-
libalp2_la_SOURCES = alp2.c alp2_pp.c
5-
libalp2_la_CFLAGS = @APR_CFLAGS@ @APU_CFLAGS@
6-
libalp2_la_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
3+
include_HEADERS = alp2.h \
4+
alp2_pp.h
5+
6+
libalp2_la_SOURCES = alp2.c \
7+
alp2_pp.c
8+
9+
libalp2_la_CFLAGS = @APR_CFLAGS@ \
10+
@APU_CFLAGS@
11+
12+
libalp2_la_LDFLAGS = @APR_LDFLAGS@ \
13+
@APU_LDFLAGS@

‎apache2/Makefile.am‎

Lines changed: 94 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,132 @@
11
pkglibdir = $(prefix)/lib
22
pkglib_LTLIBRARIES = mod_security2.la
3-
#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \
4-
# msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \
5-
# persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \
6-
# msc_lua.h msc_release.h
73

8-
mod_security2_la_SOURCES = mod_security2.c \
9-
apache2_config.c apache2_io.c apache2_util.c \
10-
re.c re_operators.c re_actions.c re_tfns.c \
11-
re_variables.c msc_logging.c msc_xml.c \
12-
msc_multipart.c modsecurity.c msc_parsers.c \
13-
msc_util.c msc_pcre.c persist_dbm.c msc_reqbody.c \
14-
msc_geo.c msc_gsb.c msc_crypt.c msc_tree.c msc_unicode.c acmp.c msc_lua.c msc_release.c \
15-
libinjection/libinjection_sqli.c
4+
mod_security2_la_SOURCES = acmp.c \
5+
apache2_config.c \
6+
apache2_io.c \
7+
apache2_util.c \
8+
libinjection/libinjection_sqli.c \
9+
mod_security2.c \
10+
modsecurity.c \
11+
msc_crypt.c \
12+
msc_geo.c \
13+
msc_gsb.c \
14+
msc_logging.c \
15+
msc_lua.c \
16+
msc_multipart.c \
17+
msc_parsers.c \
18+
msc_pcre.c \
19+
msc_release.c \
20+
msc_reqbody.c \
21+
msc_tree.c \
22+
msc_unicode.c \
23+
msc_util.c \
24+
msc_xml.c \
25+
persist_dbm.c \
26+
re_actions.c \
27+
re.c \
28+
re_operators.c \
29+
re_tfns.c \
30+
re_variables.c
1631

17-
mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
18-
@PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@
19-
mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@
20-
mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
32+
mod_security2_la_CFLAGS = @APR_CFLAGS@ \
33+
@APU_CFLAGS@ \
34+
@APXS_CFLAGS@ \
35+
@CURL_CFLAGS@ \
36+
@LIBXML2_CFLAGS@ \
37+
@LUA_CFLAGS@ \
38+
@MODSEC_EXTRA_CFLAGS@ \
39+
@PCRE_CFLAGS@
40+
41+
42+
mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ \
43+
@LIBXML2_CPPFLAGS@ \
44+
@PCRE_CPPFLAGS@
45+
46+
mod_security2_la_LIBADD = @APR_LDADD@ \
47+
@APU_LDADD@ \
48+
@LIBXML2_LDADD@ \
49+
@LUA_LDADD@ \
50+
@PCRE_LDADD@
2151

2252
if AIX
2353
mod_security2_la_LDFLAGS = -module -avoid-version \
24-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
25-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
54+
@APR_LDFLAGS@ \
55+
@APU_LDFLAGS@ \
56+
@APXS_LDFLAGS@ \
57+
@LIBXML2_LDFLAGS@ \
58+
@LUA_LDFLAGS@ \
59+
@PCRE_LDFLAGS@
2660
endif
2761

2862
if HPUX
2963
mod_security2_la_LDFLAGS = -module -avoid-version \
30-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
31-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
64+
@APR_LDFLAGS@ \
65+
@APU_LDFLAGS@ \
66+
@APXS_LDFLAGS@ \
67+
@LIBXML2_LDFLAGS@ \
68+
@LUA_LDFLAGS@ \
69+
@PCRE_LDFLAGS@
3270
endif
3371

3472
if MACOSX
3573
mod_security2_la_LDFLAGS = -module -avoid-version \
36-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
37-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
74+
@APR_LDFLAGS@ \
75+
@APU_LDFLAGS@ \
76+
@APXS_LDFLAGS@ \
77+
@LIBXML2_LDFLAGS@ \
78+
@LUA_LDFLAGS@ \
79+
@PCRE_LDFLAGS@
3880
endif
3981

4082
if SOLARIS
4183
mod_security2_la_LDFLAGS = -module -avoid-version \
42-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
43-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
84+
@APR_LDFLAGS@ \
85+
@APU_LDFLAGS@ \
86+
@APXS_LDFLAGS@ \
87+
@LIBXML2_LDFLAGS@ \
88+
@LUA_LDFLAGS@ \
89+
@PCRE_LDFLAGS@
4490
endif
4591

4692
if LINUX
4793
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \
48-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
49-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
94+
@APR_LDFLAGS@ \
95+
@APU_LDFLAGS@ \
96+
@APXS_LDFLAGS@ \
97+
@LIBXML2_LDFLAGS@ \
98+
@LUA_LDFLAGS@ \
99+
@PCRE_LDFLAGS@
50100
endif
51101

52102
if FREEBSD
53103
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
54-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
55-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
104+
@APR_LDFLAGS@ \
105+
@APU_LDFLAGS@ \
106+
@APXS_LDFLAGS@ \
107+
@LIBXML2_LDFLAGS@ \
108+
@LUA_LDFLAGS@ \
109+
@PCRE_LDFLAGS@
56110
endif
57111

58112
if OPENBSD
59113
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
60-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
61-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
114+
@APR_LDFLAGS@ \
115+
@APU_LDFLAGS@ \
116+
@APXS_LDFLAGS@ \
117+
@LIBXML2_LDFLAGS@ \
118+
@LUA_LDFLAGS@ \
119+
@PCRE_LDFLAGS@
62120
endif
63121

64122
if NETBSD
65123
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
66-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
67-
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
124+
@APR_LDFLAGS@ \
125+
@APU_LDFLAGS@ \
126+
@APXS_LDFLAGS@ \
127+
@LIBXML2_LDFLAGS@ \
128+
@LUA_LDFLAGS@ \
129+
@PCRE_LDFLAGS@
68130
endif
69131

70132
if LINUX

‎ext/Makefile.am‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
1+
12
EXT_CFLAGS = -I../apache2 \
2-
@APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
3-
@LIBXML2_CFLAGS@ @LUA_CFLAGS@
4-
EXT_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@
5-
EXT_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
3+
@APR_CFLAGS@ \
4+
@APU_CFLAGS@ \
5+
@APXS_CFLAGS@ \
6+
@LIBXML2_CFLAGS@ \
7+
@LUA_CFLAGS@
8+
9+
EXT_CPPFLAGS = @APR_CPPFLAGS@ \
10+
@LIBXML2_CPPFLAGS@
11+
12+
EXT_LIBADD = @APR_LDADD@ \
13+
@APU_LDADD@ \
14+
@LIBXML2_LDADD@ \
15+
@LUA_LDADD@
16+
617
EXT_LDFLAGS = -no-undefined -module -avoid-version \
7-
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
8-
@LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
18+
@APR_LDFLAGS@ \
19+
@APU_LDFLAGS@ \
20+
@APXS_LDFLAGS@ \
21+
@LIBXML2_LDFLAGS@ \
22+
@LUA_LDFLAGS@
923

1024
pkglibdir = $(prefix)/lib
25+
1126
pkglib_LTLIBRARIES = mod_op_strstr.la \
12-
mod_tfn_reverse.la \
13-
mod_var_remote_addr_port.la \
14-
mod_reqbody_example.la
27+
mod_tfn_reverse.la \
28+
mod_var_remote_addr_port.la \
29+
mod_reqbody_example.la
1530

1631
mod_op_strstr_la_SOURCES = mod_op_strstr.c
1732
mod_op_strstr_la_CFLAGS = $(EXT_CFLAGS)

‎mlogc/Makefile.am‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1+
12
bin_SCRIPTS = mlogc-batch-load.pl
3+
24
bin_PROGRAMS = mlogc
5+
36
mlogc_SOURCES = mlogc.c
4-
mlogc_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @CURL_CPPFLAGS@ \
5-
-I$(top_srcdir)/apache2
6-
mlogc_CFLAGS = @APR_CFLAGS@ @PCRE_CFLAGS@ @CURL_CFLAGS@
7-
mlogc_LDFLAGS = @APR_LDFLAGS@ @PCRE_LDFLAGS@ @CURL_LDFLAGS@
8-
mlogc_LDADD = @APR_LDADD@ @PCRE_LDADD@ @CURL_LDADD@
7+
8+
mlogc_CPPFLAGS = @APR_CPPFLAGS@ \
9+
@PCRE_CPPFLAGS@ \
10+
@CURL_CPPFLAGS@ \
11+
-I$(top_srcdir)/apache2
12+
13+
mlogc_CFLAGS = @APR_CFLAGS@ \
14+
@CURL_CFLAGS@ \
15+
@PCRE_CFLAGS@
16+
17+
mlogc_LDFLAGS = @APR_LDFLAGS@ \
18+
@CURL_LDFLAGS@ \
19+
@PCRE_LDFLAGS@
20+
21+
mlogc_LDADD = @APR_LDADD@ \
22+
@CURL_LDADD@ \
23+
@PCRE_LDADD@

0 commit comments

Comments
 (0)