Permalink
Browse files

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.
  • Loading branch information...
1 parent 351b9cc commit 1cde4d2dd9d96747536c1c25d06ba0677069477f @zimmerle zimmerle committed Dec 13, 2013
Showing with 325 additions and 169 deletions.
  1. +23 −24 Makefile.am
  2. +11 −4 alp2/Makefile.am
  3. +94 −32 apache2/Makefile.am
  4. +24 −9 ext/Makefile.am
  5. +20 −5 mlogc/Makefile.am
  6. +103 −58 standalone/Makefile.am
  7. +50 −37 tests/Makefile.am
View
@@ -5,32 +5,31 @@ CLEANFILES =
MAINTAINERCLEANFILES =
CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
-   tests/regression/server_root/logs/*.log
+ tests/regression/server_root/logs/*.log
MAINTAINERCLEANFILES += $(CLEANFILES) \
- Makefile.in \
- aclocal.m4 \
- alp2/Makefile.in \
- apache2/Makefile.in \
- build/config.guess \
- build/config.sub \
- build/depcomp \
- build/libtool.m4 \
- build/ltmain.sh \
- build/ltoptions.m4 \
- build/ltsugar.m4 \
- build/ltversion.m4 \
- build/lt~obsolete.m4 \
- build/missing \
- configure \
- ext/Makefile.in \
- mlogc/Makefile.in \
- modsecurity_config_auto.h.in~ \
- config.log \
- Makefile \
- config.status
-
-# Alias for "check"
+ aclocal.m4 \
+ alp2/Makefile.in \
+ apache2/Makefile.in \
+ build/config.guess \
+ build/config.sub \
+ build/depcomp \
+ build/libtool.m4 \
+ build/ltmain.sh \
+ build/lt~obsolete.m4 \
+ build/ltoptions.m4 \
+ build/ltsugar.m4 \
+ build/ltversion.m4 \
+ build/missing \
+ config.log \
+ config.status \
+ configure \
+ ext/Makefile.in \
+ Makefile \
+ Makefile.in \
+ mlogc/Makefile.in \
+ modsecurity_config_auto.h.in~
+
test: check
test-regression:
View
@@ -1,6 +1,13 @@
lib_LTLIBRARIES = libalp2.la
-include_HEADERS = alp2.h alp2_pp.h
-libalp2_la_SOURCES = alp2.c alp2_pp.c
-libalp2_la_CFLAGS = @APR_CFLAGS@ @APU_CFLAGS@
-libalp2_la_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
+include_HEADERS = alp2.h \
+ alp2_pp.h
+
+libalp2_la_SOURCES = alp2.c \
+ alp2_pp.c
+
+libalp2_la_CFLAGS = @APR_CFLAGS@ \
+ @APU_CFLAGS@
+
+libalp2_la_LDFLAGS = @APR_LDFLAGS@ \
+ @APU_LDFLAGS@
View
@@ -1,70 +1,132 @@
pkglibdir = $(prefix)/lib
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 \
- apache2_config.c apache2_io.c apache2_util.c \
- re.c re_operators.c re_actions.c re_tfns.c \
- re_variables.c msc_logging.c msc_xml.c \
- msc_multipart.c modsecurity.c msc_parsers.c \
- msc_util.c msc_pcre.c persist_dbm.c msc_reqbody.c \
- msc_geo.c msc_gsb.c msc_crypt.c msc_tree.c msc_unicode.c acmp.c msc_lua.c msc_release.c \
- libinjection/libinjection_sqli.c
+mod_security2_la_SOURCES = acmp.c \
+ apache2_config.c \
+ apache2_io.c \
+ apache2_util.c \
+ libinjection/libinjection_sqli.c \
+ mod_security2.c \
+ modsecurity.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@ \
- @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@
-mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@
-mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
+mod_security2_la_CFLAGS = @APR_CFLAGS@ \
+ @APU_CFLAGS@ \
+ @APXS_CFLAGS@ \
+ @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
mod_security2_la_LDFLAGS = -module -avoid-version \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if HPUX
mod_security2_la_LDFLAGS = -module -avoid-version \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if MACOSX
mod_security2_la_LDFLAGS = -module -avoid-version \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if SOLARIS
mod_security2_la_LDFLAGS = -module -avoid-version \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if LINUX
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if FREEBSD
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if OPENBSD
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if NETBSD
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@ \
+ @PCRE_LDFLAGS@
endif
if LINUX
View
@@ -1,17 +1,32 @@
+
EXT_CFLAGS = -I../apache2 \
- @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
- @LIBXML2_CFLAGS@ @LUA_CFLAGS@
-EXT_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@
-EXT_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
+ @APR_CFLAGS@ \
+ @APU_CFLAGS@ \
+ @APXS_CFLAGS@ \
+ @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 \
- @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
- @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+ @APR_LDFLAGS@ \
+ @APU_LDFLAGS@ \
+ @APXS_LDFLAGS@ \
+ @LIBXML2_LDFLAGS@ \
+ @LUA_LDFLAGS@
pkglibdir = $(prefix)/lib
+
pkglib_LTLIBRARIES = mod_op_strstr.la \
- mod_tfn_reverse.la \
- mod_var_remote_addr_port.la \
- mod_reqbody_example.la
+ mod_tfn_reverse.la \
+ mod_var_remote_addr_port.la \
+ mod_reqbody_example.la
mod_op_strstr_la_SOURCES = mod_op_strstr.c
mod_op_strstr_la_CFLAGS = $(EXT_CFLAGS)
View
@@ -1,8 +1,23 @@
+
bin_SCRIPTS = mlogc-batch-load.pl
+
bin_PROGRAMS = mlogc
+
mlogc_SOURCES = mlogc.c
-mlogc_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @CURL_CPPFLAGS@ \
- -I$(top_srcdir)/apache2
-mlogc_CFLAGS = @APR_CFLAGS@ @PCRE_CFLAGS@ @CURL_CFLAGS@
-mlogc_LDFLAGS = @APR_LDFLAGS@ @PCRE_LDFLAGS@ @CURL_LDFLAGS@
-mlogc_LDADD = @APR_LDADD@ @PCRE_LDADD@ @CURL_LDADD@
+
+mlogc_CPPFLAGS = @APR_CPPFLAGS@ \
+ @PCRE_CPPFLAGS@ \
+ @CURL_CPPFLAGS@ \
+ -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@
Oops, something went wrong.

0 comments on commit 1cde4d2

Please sign in to comment.