1 files changed, 24 insertions, 80 deletions

diff --git a/Makefile.in b/Makefile.in
index 07278d3..bc3d2d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,9 @@
 # @configure_input@
 
 # Modify these top variables.
-SUBDIRS = docs contrib
-SOURCES = @PACKAGE_NAME@.c
+SUBDIRS = Documentation
+SOURCES = \
+        @PACKAGE_NAME@.c
 
 HEADERS = mod_log_sql.h \
                 functions.h \
@@ -13,52 +14,22 @@ HEADERS = mod_log_sql.h \
 
 CFLAGS = -Wc,-Wall -Wc,-Werror -Wc,-fno-strict-aliasing
 
-LDADD = @RT_LIBS@
+INCLUDES = @MYSQL_CFLAGS@
 
-EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG
+LDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
+
+EXTRA_DIST = AUTHORS INSTALL LICENSE CHANGELOG make_combined_log.pl
 
 TARGET = @PACKAGE_NAME@@APXS_EXTENSION@
 
-TARGETS = $(TARGET)
+sslSOURCES = mod_log_sql_ssl.c
 
-sslSOURCES = @PACKAGE_NAME@_ssl.c
 sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@
-sslLDADD = 
-sslCFLAGS = @MOD_SSL_CFLAGS@ 
-sslNAME = log_sql_ssl
 
 ifeq (@WANT_SSL_MOD@,1)
-TARGETS += $(sslTARGET)
-endif
-
-mysqlSOURCES = @PACKAGE_NAME@_mysql.c
-mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@
-mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
-mysqlCFLAGS = @MYSQL_CFLAGS@
-mysqlNAME = log_sql_mysql
-
-ifeq (@WANT_MYSQL_MOD@,1)
-TARGETS += $(mysqlTARGET)
-endif
-
-pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c
-pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@
-pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@
-pgsqlCFLAGS = @PGSQL_CFLAGS@
-pgsqlNAME = log_sql_pgsql
-
-ifeq (@WANT_PGSQL_MOD@,1)
-TARGETS += $(pgsqlTARGET)
-endif
-
-dbiSOURCES = @PACKAGE_NAME@_dbi.c
-dbiTARGET = @PACKAGE_NAME@_dbi@APXS_EXTENSION@
-dbiLDADD = @DBI_LDFLAGS@ @DBI_LIBS@
-dbiCFLAGS = @DBI_CFLAGS@
-dbiNAME = log_sql_dbi
-
-ifeq (@WANT_DBI_MOD@,1)
-TARGETS += $(dbiTARGET)
+TARGETS = $(TARGET) $(sslTARGET)
+else
+TARGETS = $(TARGET)
 endif
 
 #Don't modify anything below here
@@ -68,11 +39,11 @@ PROVIDERS_SUBDIRS = @subdirs@
 srcdir = @abs_srcdir@
 builddir = @abs_builddir@
 
-OBJ = $(SOURCES:.c=.o) $(sslSOURCES:.c=.o) $(mysqlSOURCES:.c=.o)
+OBJ = $(SOURCES:.c=.o) $(sslSOURCES:.c=.o)
 
-LO = $(SOURCES:.c=.lo) $(sslSOURCES:.c=.lo) $(mysqlSOURCES:.c=.lo)
+LO = $(SOURCES:.c=.lo) $(sslSOURCES:.c=.lo)
 
-SLO = $(SOURCES:.c=.slo) $(sslSOURCES:.c=.slo) $(mysqlSOURCES:.c=.slo)
+SLO = $(SOURCES:.c=.slo) $(sslSOURCES:.c=.slo)
 
 STD_DIST = install-sh \
         config.sub \
@@ -84,8 +55,7 @@ STD_DIST = install-sh \
         stamp-h.in \
         config.h.in
 
-DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(HEADERS) \
-    $(sslSOURCES) $(mysqlSOURCES)
+DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(sslSOURCES) $(HEADERS)
 
 all: $(TARGETS) all-subdirs
 
@@ -104,49 +74,23 @@ all-subdirs install-subdirs activate-subdirs clean-subdirs distclean-subdirs:
                 fi; \
         done;
 
-TODO: TODO.in
-        @./gen_todo.pl
-
 $(TARGET): $(SOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(TARGET) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(LDADD) $(SOURCES)
+        @@APXS_BIN@ -c -o $(TARGET) $(INCLUDES) $(CFLAGS) \
+                $(LDADD) @DEFS@ @APACHE_DEFS@ $(SOURCES)
 
 $(sslTARGET): $(sslSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(sslTARGET) $(sslCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(sslLDADD) $(sslSOURCES)
+        @@APXS_BIN@ -c -o $(sslTARGET) $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) \
+                @DEFS@ @APACHE_DEFS@ $(sslSOURCES)
 
-$(mysqlTARGET): $(mysqlSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(mysqlTARGET) $(mysqlCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(mysqlLDADD) $(mysqlSOURCES)
-
-$(pgsqlTARGET): $(pgsqlSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(pgsqlTARGET) $(pgsqlCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES)
-
-$(dbiTARGET): $(dbiSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(dbiTARGET) $(dbiCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
+include:
+        rm -rf include
+        ln -s @APACHE_INCDIR@ include
 
 install: $(TARGETS) install-subdirs
         @@APXS_BIN@ -i $(TARGET); \
-        @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \
         if test @WANT_SSL_MOD@ -eq 1; then \
-                @APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \
-        fi; \
-        echo "*************************************************************************"; \
-        echo "*** The mod_log_sql modules have been installed."; \
-        echo "*** Please edit your Apache configuration files and"; \
-        echo "*** add the appropriate LoadModule directives per the documentation"; \
-        echo "*** in docs/manual.html"; \
-        echo "*** If you have previously used 1.18 or lower then you must change"; \
-        echo "*** >LoadModule sql_log_module modules/mod_log_sql.so"; \
-        echo "***   to"; \
-        echo "*** >LoadModule log_sql_module modules/mod_log_sql.so"; \
-        echo "*** in your httpd.conf as the internal name of the module has changed."; \
-        echo "*** "; \
-        echo "*** Also read the documentation about using SSL support and new "; \
-        echo "*** configuration directives."; \
-        echo "*************************************************************************";
+                @APXS_BIN@ -i $(sslTARGET); \
+        fi
 
 activate: activate-subdirs
         @@APXS_BIN@ -i -a $(TARGET); \