diff options
author | Christopher Powell | 2003-07-22 04:17:59 +0000 |
---|---|---|
committer | Christopher Powell | 2003-07-22 04:17:59 +0000 |
commit | 6cefab259d0b783b85df4518d0d48dab0e11389b (patch) | |
tree | 74343578540827eef162a20462a8cc0c3e9e0e38 /Makefile | |
parent | 27c519a31da825ca27aa48e1a2d3dc7b45921852 (diff) |
Changes on the way to 1.19. This is probably going to be 1.19b1. Detail:1.19b1
* Hostnames are now converted to lowercase in the mass-virtual naming section.
The loop that converts dots to underscores has been optimized as well.
* Migration to autoconf
* New directive LogSQLTableType allows one to specify the kind of table that
the module makes during table creation (e.g. InnoDB, MyISAM). Thanks to Jim
Turner for the suggestion and patch. If your MySQL server does not support
the specified type, it will create a MyISAM table instead.
* Directives can now be placed in the 'main' server config and will be
inherited by the virtual hosts. This means a LOT less repetition: you only
specify the item once to have it inherited, but it can still be overridden
on a virtualhost level.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/Makefile b/Makefile deleted file mode 100644 index af38739..0000000 --- a/Makefile +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
1 | # $Id: Makefile,v 1.21 2002/12/18 22:56:37 helios Exp $ | ||
2 | |||
3 | ########################################################################### | ||
4 | # Important: | ||
5 | # Adjust these values as outlined in section "Installation" in the docs. | ||
6 | # Not all are needed at all times. | ||
7 | |||
8 | APACHESOURCE = /usr/local/src/apache_1.3.27-dso | ||
9 | APACHEINSTALLED = /usr/local/Apache | ||
10 | APACHEHEADERS = /usr/local/Apache/include | ||
11 | APXS = $(APACHEINSTALLED)/bin/apxs | ||
12 | |||
13 | MYSQLLIBRARIES = /usr/lib | ||
14 | MYSQLHEADERS = /usr/include/mysql | ||
15 | |||
16 | #MODSSLHEADERS = /usr/local/src/apache_1.3.27-dso/src/modules/ssl | ||
17 | #DB1HEADERS = /usr/include/db1 | ||
18 | |||
19 | ########################################################################### | ||
20 | # Don't uncomment this without reading the "Optimizing for a busy database" | ||
21 | # section in the documentation (under "Advanced logging scenarios"). | ||
22 | |||
23 | #MYSQLDELAYED = -DWANT_DELAYED_MYSQL_INSERT | ||
24 | |||
25 | ########################################################################### | ||
26 | # Rarely if ever have to touch below here. | ||
27 | |||
28 | MLMVERS = 1.18 | ||
29 | #APXSGDB = -Wc,-g | ||
30 | APXSOPTS = -Wc,-O2 -Wc,-Wall | ||
31 | STATOPTS = -fpic -O2 -Wall | ||
32 | CC = gcc | ||
33 | INSTALL = /usr/bin/install -m 664 | ||
34 | RM = /bin/rm | ||
35 | LYX = /usr/bin/lyx | ||
36 | LATEX = /usr/bin/latex | ||
37 | DVIPS = /usr/bin/dvips | ||
38 | LINKS = /usr/bin/lynx | ||
39 | L2H = /usr/bin/latex2html | ||
40 | WEBSERV = gw0.corp | ||
41 | |||
42 | STATFLAGS = -I$(APACHEHEADERS) | ||
43 | SOFLAGS = -L$(MYSQLLIBRARIES) -lmysqlclient -lz | ||
44 | ifdef MODSSLHEADERS | ||
45 | FLAGS = -DEAPI -I$(MYSQLHEADERS) $(MYSQLDELAYED) -I$(MODSSLHEADERS) -I$(DB1HEADERS) -DWANT_SSL_LOGGING | ||
46 | else | ||
47 | FLAGS = -DEAPI -I$(MYSQLHEADERS) $(MYSQLDELAYED) | ||
48 | endif | ||
49 | |||
50 | all: | ||
51 | @echo "You can choose to make mod_log_sql as a static or dynamic module." | ||
52 | @echo "Either 'make dso' or 'make static'." | ||
53 | @echo | ||
54 | @echo "Please first read the documentation carefully!" | ||
55 | |||
56 | dso: mod_log_sql.so | ||
57 | |||
58 | static: mod_log_sql.o | ||
59 | |||
60 | mod_log_sql.so: mod_log_sql.c Makefile | ||
61 | $(APXS) -c $(APXSGDB) $(APXSOPTS) $(FLAGS) $(SOFLAGS) mod_log_sql.c | ||
62 | |||
63 | mod_log_sql.o: mod_log_sql.c Makefile | ||
64 | $(CC) $(STATOPTS) $(FLAGS) $(STATFLAGS) -c mod_log_sql.c | ||
65 | |||
66 | dsoinstall: dso | ||
67 | $(APXS) -i mod_log_sql.so | ||
68 | |||
69 | statinstall: static | ||
70 | $(INSTALL) -d -m 755 $(APACHESOURCE)/src/modules/sql | ||
71 | $(INSTALL) mod_log_sql.c $(APACHESOURCE)/src/modules/sql/mod_log_sql.c | ||
72 | $(INSTALL) Makefile $(APACHESOURCE)/src/modules/sql/Makefile | ||
73 | $(INSTALL) mod_log_sql.o $(APACHESOURCE)/src/modules/sql/mod_log_sql.o | ||
74 | |||
75 | clean: | ||
76 | $(RM) -rf *.o *.so | ||
77 | $(RM) -f Documentation/HTML/*.html Documentation/HTML/*.css Documentation/HTML/*.png | ||
78 | $(RM) -f Documentation/*.tex | ||
79 | $(RM) -f Documentation/*.dvi | ||
80 | $(RM) -f Documentation/*.ps | ||
81 | $(RM) -f Documentation/*.txt | ||
82 | |||
83 | distro: documentation | ||
84 | @scp CHANGELOG $(WEBSERV):$(APACHEINSTALLED)/html/mod_log_sql/docs | ||
85 | @scp Documentation/*.ps $(WEBSERV):$(APACHEINSTALLED)/html/mod_log_sql/docs | ||
86 | @scp Documentation/HTML/*.html $(WEBSERV):$(APACHEINSTALLED)/html/mod_log_sql/docs/ | ||
87 | @scp Documentation/HTML/*.png $(WEBSERV):$(APACHEINSTALLED)/html/mod_log_sql/docs/ | ||
88 | @cd ..; tar jcf mod_log_sql-$(MLMVERS).tar.bz2 --exclude mod_log_sql/CVS --exclude mod_log_sql/Documentation/CVS --exclude mod_log_sql/Documentation/HTML/CVS --exclude ".directory" mod_log_sql/; scp mod_log_sql-$(MLMVERS).tar.bz2 $(WEBSERV):$(APACHEINSTALLED)/html/mod_log_sql/; rm -f mod_log_sql-$(MLMVERS).tar.bz2 | ||
89 | @ssh $(WEBSERV) "ln -sf mod_log_sql-$(MLMVERS).tar.bz2 $(APACHEINSTALLED)/html/mod_log_sql/mod_log_sql.tar.bz2" | ||
90 | |||
91 | pre-distro: documentation | ||
92 | @cd ..; tar jcf mod_log_sql-$(MLMVERS).tar.bz2 --exclude mod_log_sql/CVS --exclude mod_log_sql/Documentation/CVS --exclude mod_log_sql/Documentation/HTML/CVS --exclude ".directory" mod_log_sql/; scp mod_log_sql-$(MLMVERS).tar.bz2 $(WEBSERV):$(APACHEINSTALLED)/html/mod_log_sql/; rm -f mod_log_sql-$(MLMVERS).tar.bz2 | ||
93 | |||
94 | documentation: Documentation/documentation.lyx | ||
95 | @echo "Creating LaTeX docs..." | ||
96 | @$(LYX) --export latex Documentation/documentation.lyx 2>/dev/null | ||
97 | @echo "Creating cross-references...run 1" | ||
98 | @cd Documentation ; $(LATEX) documentation.tex >/dev/null 2>&1 | ||
99 | @echo "Creating cross-references...run 2" | ||
100 | @cd Documentation ; $(LATEX) documentation.tex >/dev/null 2>&1 | ||
101 | @echo "Creating cross-references...run 3" | ||
102 | @cd Documentation ; $(LATEX) documentation.tex >/dev/null 2>&1 | ||
103 | @echo "Creating PostScript docs..." | ||
104 | @$(DVIPS) Documentation/documentation.dvi -o Documentation/documentation.ps 2>/dev/null | ||
105 | @echo "Creating HTML docs..." | ||
106 | @$(L2H) -local_icons -show_section_numbers -split 4 -navigation -noindex_in_navigation -contents_in_navigation -dir Documentation/HTML Documentation/documentation.tex >/dev/null 2>&1 | ||
107 | @echo "Creating plain text docs..." | ||
108 | @$(L2H) -show_section_numbers -split 0 -dir Documentation/ Documentation/documentation.tex >/dev/null 2>&1 | ||
109 | @$(LINKS) -dump -nolist -width=120 -dump Documentation/documentation.html > Documentation/documentation.txt 2>/dev/null | ||
110 | @echo "Cleaning up..." | ||
111 | @$(RM) -f Documentation/*.html Documentation/WARNINGS Documentation/*.pl Documentation/*.aux Documentation/*.css Documentation/*.toc Documentation/*.log Documentation/*.old Documentation/*.png Documentation/images.tex | ||
112 | @$(RM) -f Documentation/HTML/WARNINGS Documentation/HTML/*.pl Documentation/HTML/*.log Documentation/HTML/*.aux Documentation/HTML/*.tex Documentation/HTML/*.old Documentation/HTML/index.html | ||