mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-14 13:56:01 +03:00
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.
This commit is contained in:
Felipe Zimmerle
parent
351b9cc357
commit
1cde4d2dd9
45
Makefile.am
45
Makefile.am
@ -5,32 +5,31 @@ CLEANFILES =
|
|||||||
MAINTAINERCLEANFILES =
|
MAINTAINERCLEANFILES =
|
||||||
|
|
||||||
CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
|
CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
|
||||||
tests/regression/server_root/logs/*.log
|
tests/regression/server_root/logs/*.log
|
||||||
|
|
||||||
MAINTAINERCLEANFILES += $(CLEANFILES) \
|
MAINTAINERCLEANFILES += $(CLEANFILES) \
|
||||||
Makefile.in \
|
aclocal.m4 \
|
||||||
aclocal.m4 \
|
alp2/Makefile.in \
|
||||||
alp2/Makefile.in \
|
apache2/Makefile.in \
|
||||||
apache2/Makefile.in \
|
build/config.guess \
|
||||||
build/config.guess \
|
build/config.sub \
|
||||||
build/config.sub \
|
build/depcomp \
|
||||||
build/depcomp \
|
build/libtool.m4 \
|
||||||
build/libtool.m4 \
|
build/ltmain.sh \
|
||||||
build/ltmain.sh \
|
build/lt~obsolete.m4 \
|
||||||
build/ltoptions.m4 \
|
build/ltoptions.m4 \
|
||||||
build/ltsugar.m4 \
|
build/ltsugar.m4 \
|
||||||
build/ltversion.m4 \
|
build/ltversion.m4 \
|
||||||
build/lt~obsolete.m4 \
|
build/missing \
|
||||||
build/missing \
|
config.log \
|
||||||
configure \
|
config.status \
|
||||||
ext/Makefile.in \
|
configure \
|
||||||
mlogc/Makefile.in \
|
ext/Makefile.in \
|
||||||
modsecurity_config_auto.h.in~ \
|
Makefile \
|
||||||
config.log \
|
Makefile.in \
|
||||||
Makefile \
|
mlogc/Makefile.in \
|
||||||
config.status
|
modsecurity_config_auto.h.in~
|
||||||
|
|
||||||
# Alias for "check"
|
|
||||||
test: check
|
test: check
|
||||||
|
|
||||||
test-regression:
|
test-regression:
|
||||||
|
|||||||
@ -1,6 +1,13 @@
|
|||||||
lib_LTLIBRARIES = libalp2.la
|
lib_LTLIBRARIES = libalp2.la
|
||||||
include_HEADERS = alp2.h alp2_pp.h
|
|
||||||
|
|
||||||
libalp2_la_SOURCES = alp2.c alp2_pp.c
|
include_HEADERS = alp2.h \
|
||||||
libalp2_la_CFLAGS = @APR_CFLAGS@ @APU_CFLAGS@
|
alp2_pp.h
|
||||||
libalp2_la_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
|
|
||||||
|
libalp2_la_SOURCES = alp2.c \
|
||||||
|
alp2_pp.c
|
||||||
|
|
||||||
|
libalp2_la_CFLAGS = @APR_CFLAGS@ \
|
||||||
|
@APU_CFLAGS@
|
||||||
|
|
||||||
|
libalp2_la_LDFLAGS = @APR_LDFLAGS@ \
|
||||||
|
@APU_LDFLAGS@
|
||||||
|
|||||||
@ -1,70 +1,132 @@
|
|||||||
pkglibdir = $(prefix)/lib
|
pkglibdir = $(prefix)/lib
|
||||||
pkglib_LTLIBRARIES = mod_security2.la
|
pkglib_LTLIBRARIES = mod_security2.la
|
||||||
#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \
|
|
||||||
# msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \
|
|
||||||
# persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \
|
|
||||||
# msc_lua.h msc_release.h
|
|
||||||
|
|
||||||
mod_security2_la_SOURCES = mod_security2.c \
|
mod_security2_la_SOURCES = acmp.c \
|
||||||
apache2_config.c apache2_io.c apache2_util.c \
|
apache2_config.c \
|
||||||
re.c re_operators.c re_actions.c re_tfns.c \
|
apache2_io.c \
|
||||||
re_variables.c msc_logging.c msc_xml.c \
|
apache2_util.c \
|
||||||
msc_multipart.c modsecurity.c msc_parsers.c \
|
libinjection/libinjection_sqli.c \
|
||||||
msc_util.c msc_pcre.c persist_dbm.c msc_reqbody.c \
|
mod_security2.c \
|
||||||
msc_geo.c msc_gsb.c msc_crypt.c msc_tree.c msc_unicode.c acmp.c msc_lua.c msc_release.c \
|
modsecurity.c \
|
||||||
libinjection/libinjection_sqli.c
|
msc_crypt.c \
|
||||||
|
msc_geo.c \
|
||||||
|
msc_gsb.c \
|
||||||
|
msc_logging.c \
|
||||||
|
msc_lua.c \
|
||||||
|
msc_multipart.c \
|
||||||
|
msc_parsers.c \
|
||||||
|
msc_pcre.c \
|
||||||
|
msc_release.c \
|
||||||
|
msc_reqbody.c \
|
||||||
|
msc_tree.c \
|
||||||
|
msc_unicode.c \
|
||||||
|
msc_util.c \
|
||||||
|
msc_xml.c \
|
||||||
|
persist_dbm.c \
|
||||||
|
re_actions.c \
|
||||||
|
re.c \
|
||||||
|
re_operators.c \
|
||||||
|
re_tfns.c \
|
||||||
|
re_variables.c
|
||||||
|
|
||||||
mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
|
mod_security2_la_CFLAGS = @APR_CFLAGS@ \
|
||||||
@PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@
|
@APU_CFLAGS@ \
|
||||||
mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@
|
@APXS_CFLAGS@ \
|
||||||
mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
|
@CURL_CFLAGS@ \
|
||||||
|
@LIBXML2_CFLAGS@ \
|
||||||
|
@LUA_CFLAGS@ \
|
||||||
|
@MODSEC_EXTRA_CFLAGS@ \
|
||||||
|
@PCRE_CFLAGS@
|
||||||
|
|
||||||
|
|
||||||
|
mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ \
|
||||||
|
@LIBXML2_CPPFLAGS@ \
|
||||||
|
@PCRE_CPPFLAGS@
|
||||||
|
|
||||||
|
mod_security2_la_LIBADD = @APR_LDADD@ \
|
||||||
|
@APU_LDADD@ \
|
||||||
|
@LIBXML2_LDADD@ \
|
||||||
|
@LUA_LDADD@ \
|
||||||
|
@PCRE_LDADD@
|
||||||
|
|
||||||
if AIX
|
if AIX
|
||||||
mod_security2_la_LDFLAGS = -module -avoid-version \
|
mod_security2_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HPUX
|
if HPUX
|
||||||
mod_security2_la_LDFLAGS = -module -avoid-version \
|
mod_security2_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if MACOSX
|
if MACOSX
|
||||||
mod_security2_la_LDFLAGS = -module -avoid-version \
|
mod_security2_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if SOLARIS
|
if SOLARIS
|
||||||
mod_security2_la_LDFLAGS = -module -avoid-version \
|
mod_security2_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if LINUX
|
if LINUX
|
||||||
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \
|
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if FREEBSD
|
if FREEBSD
|
||||||
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
|
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if OPENBSD
|
if OPENBSD
|
||||||
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
|
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if NETBSD
|
if NETBSD
|
||||||
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
|
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if LINUX
|
if LINUX
|
||||||
|
|||||||
@ -1,17 +1,32 @@
|
|||||||
|
|
||||||
EXT_CFLAGS = -I../apache2 \
|
EXT_CFLAGS = -I../apache2 \
|
||||||
@APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
|
@APR_CFLAGS@ \
|
||||||
@LIBXML2_CFLAGS@ @LUA_CFLAGS@
|
@APU_CFLAGS@ \
|
||||||
EXT_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@
|
@APXS_CFLAGS@ \
|
||||||
EXT_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
|
@LIBXML2_CFLAGS@ \
|
||||||
|
@LUA_CFLAGS@
|
||||||
|
|
||||||
|
EXT_CPPFLAGS = @APR_CPPFLAGS@ \
|
||||||
|
@LIBXML2_CPPFLAGS@
|
||||||
|
|
||||||
|
EXT_LIBADD = @APR_LDADD@ \
|
||||||
|
@APU_LDADD@ \
|
||||||
|
@LIBXML2_LDADD@ \
|
||||||
|
@LUA_LDADD@
|
||||||
|
|
||||||
EXT_LDFLAGS = -no-undefined -module -avoid-version \
|
EXT_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@
|
||||||
|
|
||||||
pkglibdir = $(prefix)/lib
|
pkglibdir = $(prefix)/lib
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = mod_op_strstr.la \
|
pkglib_LTLIBRARIES = mod_op_strstr.la \
|
||||||
mod_tfn_reverse.la \
|
mod_tfn_reverse.la \
|
||||||
mod_var_remote_addr_port.la \
|
mod_var_remote_addr_port.la \
|
||||||
mod_reqbody_example.la
|
mod_reqbody_example.la
|
||||||
|
|
||||||
mod_op_strstr_la_SOURCES = mod_op_strstr.c
|
mod_op_strstr_la_SOURCES = mod_op_strstr.c
|
||||||
mod_op_strstr_la_CFLAGS = $(EXT_CFLAGS)
|
mod_op_strstr_la_CFLAGS = $(EXT_CFLAGS)
|
||||||
|
|||||||
@ -1,8 +1,23 @@
|
|||||||
|
|
||||||
bin_SCRIPTS = mlogc-batch-load.pl
|
bin_SCRIPTS = mlogc-batch-load.pl
|
||||||
|
|
||||||
bin_PROGRAMS = mlogc
|
bin_PROGRAMS = mlogc
|
||||||
|
|
||||||
mlogc_SOURCES = mlogc.c
|
mlogc_SOURCES = mlogc.c
|
||||||
mlogc_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @CURL_CPPFLAGS@ \
|
|
||||||
-I$(top_srcdir)/apache2
|
mlogc_CPPFLAGS = @APR_CPPFLAGS@ \
|
||||||
mlogc_CFLAGS = @APR_CFLAGS@ @PCRE_CFLAGS@ @CURL_CFLAGS@
|
@PCRE_CPPFLAGS@ \
|
||||||
mlogc_LDFLAGS = @APR_LDFLAGS@ @PCRE_LDFLAGS@ @CURL_LDFLAGS@
|
@CURL_CPPFLAGS@ \
|
||||||
mlogc_LDADD = @APR_LDADD@ @PCRE_LDADD@ @CURL_LDADD@
|
-I$(top_srcdir)/apache2
|
||||||
|
|
||||||
|
mlogc_CFLAGS = @APR_CFLAGS@ \
|
||||||
|
@CURL_CFLAGS@ \
|
||||||
|
@PCRE_CFLAGS@
|
||||||
|
|
||||||
|
mlogc_LDFLAGS = @APR_LDFLAGS@ \
|
||||||
|
@CURL_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
|
|
||||||
|
mlogc_LDADD = @APR_LDADD@ \
|
||||||
|
@CURL_LDADD@ \
|
||||||
|
@PCRE_LDADD@
|
||||||
|
|||||||
@ -1,94 +1,139 @@
|
|||||||
pkglibdir = $(prefix)/lib
|
pkglibdir = $(prefix)/lib
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = standalone.la
|
pkglib_LTLIBRARIES = standalone.la
|
||||||
#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \
|
|
||||||
# msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \
|
|
||||||
# persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \
|
|
||||||
# msc_lua.h msc_release.h
|
|
||||||
|
|
||||||
standalone_la_SOURCES = ../apache2/mod_security2.c \
|
standalone_la_SOURCES = ../apache2/acmp.c \
|
||||||
../apache2/apache2_config.c ../apache2/apache2_io.c ../apache2/apache2_util.c \
|
../apache2/apache2_config.c \
|
||||||
../apache2/re.c ../apache2/re_operators.c ../apache2/re_actions.c ../apache2/re_tfns.c \
|
../apache2/apache2_io.c \
|
||||||
../apache2/re_variables.c ../apache2/msc_logging.c ../apache2/msc_xml.c \
|
../apache2/apache2_util.c \
|
||||||
../apache2/msc_multipart.c ../apache2/modsecurity.c ../apache2/msc_parsers.c \
|
../apache2/libinjection/libinjection_sqli.c \
|
||||||
../apache2/msc_util.c ../apache2/msc_pcre.c ../apache2/persist_dbm.c ../apache2/msc_reqbody.c \
|
../apache2/mod_security2.c \
|
||||||
../apache2/msc_geo.c ../apache2/msc_gsb.c ../apache2/msc_unicode.c \
|
../apache2/modsecurity.c \
|
||||||
../apache2/acmp.c ../apache2/msc_lua.c ../apache2/msc_release.c \
|
../apache2/msc_crypt.c \
|
||||||
../apache2/msc_crypt.c ../apache2/msc_tree.c ../apache2/libinjection/libinjection_sqli.c \
|
../apache2/msc_geo.c \
|
||||||
api.c buckets.c \
|
../apache2/msc_gsb.c \
|
||||||
config.c filters.c \
|
../apache2/msc_logging.c \
|
||||||
hooks.c \
|
../apache2/msc_lua.c \
|
||||||
regex.c server.c
|
../apache2/msc_multipart.c \
|
||||||
|
../apache2/msc_parsers.c \
|
||||||
|
../apache2/msc_pcre.c \
|
||||||
|
../apache2/msc_release.c \
|
||||||
|
../apache2/msc_reqbody.c \
|
||||||
|
../apache2/msc_tree.c \
|
||||||
|
../apache2/msc_unicode.c \
|
||||||
|
../apache2/msc_util.c \
|
||||||
|
../apache2/msc_xml.c \
|
||||||
|
../apache2/persist_dbm.c \
|
||||||
|
../apache2/re_actions.c \
|
||||||
|
../apache2/re.c \
|
||||||
|
../apache2/re_operators.c \
|
||||||
|
../apache2/re_tfns.c \
|
||||||
|
../apache2/re_variables.c \
|
||||||
|
api.c \
|
||||||
|
buckets.c \
|
||||||
|
config.c \
|
||||||
|
filters.c \
|
||||||
|
hooks.c \
|
||||||
|
regex.c \
|
||||||
|
server.c
|
||||||
|
|
||||||
standalone_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
|
# FIXME: Standalone does not mean that it will be a nginx build.
|
||||||
@PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ -DVERSION_NGINX
|
standalone_la_CFLAGS = -DVERSION_NGINX \
|
||||||
standalone_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@
|
@APR_CFLAGS@ \
|
||||||
standalone_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
|
@APU_CFLAGS@ \
|
||||||
|
@APXS_CFLAGS@ \
|
||||||
|
@CURL_CFLAGS@ \
|
||||||
|
@LIBXML2_CFLAGS@ \
|
||||||
|
@LUA_CFLAGS@ \
|
||||||
|
@MODSEC_EXTRA_CFLAGS@ \
|
||||||
|
@PCRE_CFLAGS@
|
||||||
|
|
||||||
|
standalone_la_CPPFLAGS = @APR_CPPFLAGS@ \
|
||||||
|
@LIBXML2_CPPFLAGS@ \
|
||||||
|
@PCRE_CPPFLAGS@
|
||||||
|
|
||||||
|
standalone_la_LIBADD = @APR_LDADD@ \
|
||||||
|
@APU_LDADD@ \
|
||||||
|
@LIBXML2_LDADD@ \
|
||||||
|
@LUA_LDADD@ \
|
||||||
|
@PCRE_LDADD@
|
||||||
|
|
||||||
if AIX
|
if AIX
|
||||||
standalone_la_LDFLAGS = -module -avoid-version \
|
standalone_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HPUX
|
if HPUX
|
||||||
standalone_la_LDFLAGS = -module -avoid-version \
|
standalone_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if MACOSX
|
if MACOSX
|
||||||
standalone_la_LDFLAGS = -module -avoid-version \
|
standalone_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if SOLARIS
|
if SOLARIS
|
||||||
standalone_la_LDFLAGS = -module -avoid-version \
|
standalone_la_LDFLAGS = -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if LINUX
|
if LINUX
|
||||||
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if FREEBSD
|
if FREEBSD
|
||||||
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if OPENBSD
|
if OPENBSD
|
||||||
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if NETBSD
|
if NETBSD
|
||||||
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
|
||||||
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APR_LDFLAGS@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
standalone_INCS = `echo "@LIBXML2_CFLAGS@ @LUA_CFLAGS@" | sed -n 's/ *-I *\([^ ]*\) /\1 /gp'` \
|
|
||||||
@APXS_INCLUDEDIR@ @APR_INCLUDEDIR@ @APU_INCLUDEDIR@
|
|
||||||
standalone_LIBS = @APR_LINKLD@ @APU_LINKLD@ @APXS_LDFLAGS@ \
|
|
||||||
@PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
|
|
||||||
install-exec-hook: $(pkglib_LTLIBRARIES)
|
|
||||||
@echo "Creating Nginx config file..."; \
|
|
||||||
rm -f ../nginx/modsecurity/config; \
|
|
||||||
echo "ngx_addon_name=ngx_http_modsecurity" >> ../nginx/modsecurity/config; \
|
|
||||||
echo "CORE_MODULES=\"\$$CORE_MODULES ngx_pool_context_module\"" >> ../nginx/modsecurity/config; \
|
|
||||||
echo "HTTP_AUX_FILTER_MODULES=\"ngx_http_modsecurity \$$HTTP_AUX_FILTER_MODULES\"" >> ../nginx/modsecurity/config; \
|
|
||||||
echo "NGX_ADDON_SRCS=\"\$$NGX_ADDON_SRCS \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config;\
|
|
||||||
echo "NGX_ADDON_DEPS=\"\$$NGX_ADDON_DEPS \$$ngx_addon_dir/apr_bucket_nginx.h \$$ngx_addon_dir/ngx_pool_context.h \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config; \
|
|
||||||
echo "CORE_LIBS=\"\$$CORE_LIBS \$$ngx_addon_dir/../../standalone/.libs/standalone.a $(standalone_LIBS) \"" >> ../nginx/modsecurity/config; \
|
|
||||||
echo "CORE_INCS=\"\$$CORE_INCS \$$ngx_addon_dir \$$ngx_addon_dir/../../standalone \$$ngx_addon_dir/../../apache2 $(standalone_INCS)\"" >> ../nginx/modsecurity/config; \
|
|
||||||
echo "Removing unused static libraries..."; \
|
|
||||||
for m in $(pkglib_LTLIBRARIES); do \
|
|
||||||
base=`echo $$m | sed 's/\..*//'`; \
|
|
||||||
rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \
|
|
||||||
cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(APXS_MODULES); \
|
|
||||||
done
|
|
||||||
|
|||||||
@ -1,43 +1,56 @@
|
|||||||
check_PROGRAMS = msc_test
|
check_PROGRAMS = msc_test
|
||||||
msc_test_SOURCES = msc_test.c \
|
msc_test_SOURCES = msc_test.c \
|
||||||
$(top_srcdir)/standalone/server.c \
|
$(top_srcdir)/apache2/acmp.c \
|
||||||
$(top_srcdir)/standalone/regex.c \
|
$(top_srcdir)/apache2/libinjection/libinjection_sqli.c \
|
||||||
$(top_srcdir)/apache2/re.c \
|
$(top_srcdir)/apache2/modsecurity.c \
|
||||||
$(top_srcdir)/apache2/re_operators.c \
|
$(top_srcdir)/apache2/msc_crypt.c \
|
||||||
$(top_srcdir)/apache2/re_actions.c \
|
$(top_srcdir)/apache2/msc_geo.c \
|
||||||
$(top_srcdir)/apache2/re_tfns.c \
|
$(top_srcdir)/apache2/msc_gsb.c \
|
||||||
$(top_srcdir)/apache2/re_variables.c \
|
$(top_srcdir)/apache2/msc_logging.c \
|
||||||
$(top_srcdir)/apache2/msc_logging.c \
|
$(top_srcdir)/apache2/msc_lua.c \
|
||||||
$(top_srcdir)/apache2/msc_xml.c \
|
$(top_srcdir)/apache2/msc_multipart.c \
|
||||||
$(top_srcdir)/apache2/msc_multipart.c \
|
$(top_srcdir)/apache2/msc_parsers.c \
|
||||||
$(top_srcdir)/apache2/modsecurity.c \
|
$(top_srcdir)/apache2/msc_pcre.c \
|
||||||
$(top_srcdir)/apache2/msc_parsers.c \
|
$(top_srcdir)/apache2/msc_release.c \
|
||||||
$(top_srcdir)/apache2/msc_util.c \
|
$(top_srcdir)/apache2/msc_reqbody.c \
|
||||||
$(top_srcdir)/apache2/msc_pcre.c \
|
$(top_srcdir)/apache2/msc_tree.c \
|
||||||
$(top_srcdir)/apache2/msc_unicode.c \
|
$(top_srcdir)/apache2/msc_unicode.c \
|
||||||
$(top_srcdir)/apache2/persist_dbm.c \
|
$(top_srcdir)/apache2/msc_util.c \
|
||||||
$(top_srcdir)/apache2/msc_reqbody.c \
|
$(top_srcdir)/apache2/msc_xml.c \
|
||||||
$(top_srcdir)/apache2/msc_crypt.c \
|
$(top_srcdir)/apache2/persist_dbm.c \
|
||||||
$(top_srcdir)/apache2/msc_json.c \
|
$(top_srcdir)/apache2/re_actions.c \
|
||||||
$(top_srcdir)/apache2/msc_tree.c \
|
$(top_srcdir)/apache2/re.c \
|
||||||
$(top_srcdir)/apache2/msc_geo.c \
|
$(top_srcdir)/apache2/re_operators.c \
|
||||||
$(top_srcdir)/apache2/msc_gsb.c \
|
$(top_srcdir)/apache2/re_tfns.c \
|
||||||
$(top_srcdir)/apache2/acmp.c \
|
$(top_srcdir)/apache2/re_variables.c \
|
||||||
$(top_srcdir)/apache2/msc_lua.c \
|
$(top_srcdir)/standalone/regex.c \
|
||||||
$(top_srcdir)/apache2/msc_release.c \
|
$(top_srcdir)/standalone/server.c
|
||||||
$(top_srcdir)/apache2/libinjection/libinjection_sqli.c
|
|
||||||
msc_test_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
|
msc_test_CFLAGS = @APR_CFLAGS@ \
|
||||||
@PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @LUA_CFLAGS@ \
|
@APU_CFLAGS@ \
|
||||||
@YAJL_CFLAGS@
|
@APXS_CFLAGS@ \
|
||||||
|
@LIBXML2_CFLAGS@ \
|
||||||
|
@LUA_CFLAGS@ \
|
||||||
|
@MODSEC_EXTRA_CFLAGS@ \
|
||||||
|
@PCRE_CFLAGS@
|
||||||
|
|
||||||
msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
|
msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
|
||||||
@APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ \
|
@APR_CPPFLAGS@ \
|
||||||
@PCRE_CPPFLAGS@
|
@LIBXML2_CPPFLAGS@ \
|
||||||
msc_test_LDADD = @APR_LDADD@ @APU_LDADD@ \
|
@PCRE_CPPFLAGS@
|
||||||
@PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ \
|
|
||||||
@YAJL_LDADD@
|
msc_test_LDADD = @APR_LDADD@ \
|
||||||
msc_test_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
|
@APU_LDADD@ \
|
||||||
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ \
|
@LIBXML2_LDADD@ \
|
||||||
@YAJL_LDFLAGS@
|
@LUA_LDADD@ \
|
||||||
|
@PCRE_LDADD@
|
||||||
|
|
||||||
|
msc_test_LDFLAGS = @APR_LDFLAGS@ \
|
||||||
|
@APU_LDFLAGS@ \
|
||||||
|
@APXS_LDFLAGS@ \
|
||||||
|
@LIBXML2_LDFLAGS@ \
|
||||||
|
@LUA_LDFLAGS@ \
|
||||||
|
@PCRE_LDFLAGS@
|
||||||
|
|
||||||
check_SCRIPTS = run-unit-tests.pl
|
check_SCRIPTS = run-unit-tests.pl
|
||||||
TESTS = $(check_SCRIPTS)
|
TESTS = $(check_SCRIPTS)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user