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.

apache2/Makefile.am

@@ -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