summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--doc/scripts/Makefile.am1
-rw-r--r--src/Makefile.am73
-rw-r--r--tests/Makefile.am91
-rw-r--r--tests/docroot/www/Makefile.am32
5 files changed, 116 insertions, 83 deletions
diff --git a/Makefile.am b/Makefile.am
index 390831bb..ff5d6a82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS=src doc tests
-EXTRA_DIST=autogen.sh SConstruct
+EXTRA_DIST=autogen.sh SConstruct CMakeLists.txt cmake
ACLOCAL_AMFLAGS = -I m4
diff --git a/doc/scripts/Makefile.am b/doc/scripts/Makefile.am
index 08aaa259..b07b8a2f 100644
--- a/doc/scripts/Makefile.am
+++ b/doc/scripts/Makefile.am
@@ -1,3 +1,4 @@
EXTRA_DIST= \
+ create-mime.conf.pl \
rrdtool-graph.sh \
spawn-php.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index a4ada198..85367805 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,27 +57,27 @@ MAINTAINERCLEANFILES = configparser.c configparser.h mod_ssi_exprparser.c mod_ss
CLEANFILES = versionstamp.h versionstamp.h.tmp
common_src=buffer.c log.c \
- keyvalue.c chunk.c \
- http_chunk.c stream.c fdevent.c \
- stat_cache.c plugin.c joblist.c etag.c array.c \
- data_string.c data_count.c data_array.c \
- data_integer.c md5.c data_fastcgi.c \
- fdevent_select.c fdevent_libev.c \
- fdevent_poll.c fdevent_linux_sysepoll.c \
- fdevent_solaris_devpoll.c fdevent_solaris_port.c \
- fdevent_freebsd_kqueue.c \
- data_config.c \
- inet_ntop_cache.c crc32.c \
- connections-glue.c \
- configfile-glue.c \
- http-header-glue.c \
- network_write.c network_linux_sendfile.c \
- network_freebsd_sendfile.c network_writev.c \
- network_solaris_sendfilev.c network_openssl.c \
- splaytree.c status_counter.c
+ keyvalue.c chunk.c \
+ http_chunk.c stream.c fdevent.c \
+ stat_cache.c plugin.c joblist.c etag.c array.c \
+ data_string.c data_count.c data_array.c \
+ data_integer.c md5.c data_fastcgi.c \
+ fdevent_select.c fdevent_libev.c \
+ fdevent_poll.c fdevent_linux_sysepoll.c \
+ fdevent_solaris_devpoll.c fdevent_solaris_port.c \
+ fdevent_freebsd_kqueue.c \
+ data_config.c \
+ inet_ntop_cache.c crc32.c \
+ connections-glue.c \
+ configfile-glue.c \
+ http-header-glue.c \
+ network_write.c network_linux_sendfile.c \
+ network_freebsd_sendfile.c network_writev.c \
+ network_solaris_sendfilev.c network_openssl.c \
+ splaytree.c status_counter.c
src = server.c response.c connections.c network.c \
- configfile.c configparser.c request.c proc_open.c
+ configfile.c configparser.c request.c proc_open.c
lib_LTLIBRARIES =
@@ -267,19 +267,19 @@ mod_accesslog_la_LIBADD = $(common_libadd)
hdr = server.h buffer.h network.h log.h keyvalue.h \
- response.h request.h fastcgi.h chunk.h \
- settings.h http_chunk.h \
- md5.h http_auth.h stream.h \
- fdevent.h connections.h base.h stat_cache.h \
- plugin.h mod_auth.h \
- etag.h joblist.h array.h crc32.h \
- network_backends.h configfile.h \
- mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
- configparser.h mod_ssi_exprparser.h \
- sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
- splaytree.h proc_open.h status_counter.h \
- mod_magnet_cache.h \
- version.h
+ response.h request.h fastcgi.h chunk.h \
+ settings.h http_chunk.h \
+ md5.h http_auth.h stream.h \
+ fdevent.h connections.h base.h stat_cache.h \
+ plugin.h mod_auth.h \
+ etag.h joblist.h array.h crc32.h \
+ network_backends.h configfile.h \
+ mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
+ configparser.h mod_ssi_exprparser.h \
+ sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
+ splaytree.h proc_open.h status_counter.h \
+ mod_magnet_cache.h \
+ version.h
DEFS= @DEFS@ -DHAVE_VERSION_H -DLIBRARY_DIR="\"$(libdir)\"" -DSBIN_DIR="\"$(sbindir)\""
@@ -307,5 +307,10 @@ proc_open_CPPFLAGS= -DDEBUG_PROC_OPEN
#ajp_SOURCES = ajp.c
noinst_HEADERS = $(hdr)
-EXTRA_DIST = mod_skeleton.c configparser.y mod_ssi_exprparser.y lempar.c SConscript
-
+EXTRA_DIST = \
+ mod_skeleton.c \
+ configparser.y \
+ mod_ssi_exprparser.y \
+ lempar.c \
+ SConscript \
+ CMakeLists.txt config.h.cmake
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7044ebd9..cf9aa9aa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,54 +17,59 @@ TESTS=\
cleanup.sh
CONFS=\
- 404-handler.conf \
- bug-06.conf \
- bug-12.conf \
- cachable.t \
- condition.conf \
- core-404-handler.t \
- core-condition.t \
- core-keepalive.t \
- core-request.t \
- core-response.t \
- core-var-include.t \
- core.t \
- fastcgi-10.conf \
- fastcgi-13.conf \
- fastcgi-auth.conf \
- fastcgi-responder.conf \
- LightyTest.pm \
- lowercase.conf \
- lowercase.t \
- mod-access.t \
- mod-auth.t \
- mod-cgi.t \
- mod-compress.conf \
- mod-compress.t \
- mod-fastcgi.t \
- mod-proxy.t \
- mod-redirect.t \
- mod-rewrite.t \
- mod-secdownload.t \
- mod-setenv.t \
- mod-simplevhost.conf \
- mod-simplevhost.t \
- mod-ssi.t \
- mod-userdir.t \
- proxy.conf \
- request.t \
- symlink.t \
- var-include-sub.conf \
- var-include.conf
+ 404-handler.conf \
+ bug-06.conf \
+ bug-12.conf \
+ cachable.t \
+ condition.conf \
+ core-404-handler.t \
+ core-condition.t \
+ core-keepalive.t \
+ core-request.t \
+ core-response.t \
+ core-var-include.t \
+ core.t \
+ fastcgi-10.conf \
+ fastcgi-13.conf \
+ fastcgi-auth.conf \
+ fastcgi-responder.conf \
+ LightyTest.pm \
+ lowercase.conf \
+ lowercase.t \
+ mod-access.t \
+ mod-auth.t \
+ mod-cgi.t \
+ mod-compress.conf \
+ mod-compress.t \
+ mod-extforward.conf \
+ mod-extforward.t \
+ mod-fastcgi.t \
+ mod-proxy.t \
+ mod-redirect.t \
+ mod-rewrite.t \
+ mod-secdownload.t \
+ mod-setenv.t \
+ mod-simplevhost.conf \
+ mod-simplevhost.t \
+ mod-ssi.t \
+ mod-userdir.t \
+ proxy.conf \
+ request.t \
+ symlink.t \
+ var-include-sub.conf \
+ var-include.conf
TESTS_ENVIRONMENT=$(srcdir)/wrapper.sh $(srcdir) $(top_builddir)
-EXTRA_DIST=wrapper.sh lighttpd.conf \
- lighttpd.user \
+EXTRA_DIST=\
+ $(CONFS) \
+ $(TESTS) \
+ CMakeLists.txt \
+ lighttpd.conf \
lighttpd.htpasswd \
+ lighttpd.user \
SConscript \
- $(CONFS) \
- $(TESTS)
+ wrapper.sh
SUBDIRS=docroot
diff --git a/tests/docroot/www/Makefile.am b/tests/docroot/www/Makefile.am
index 5bc0c0b3..7bc9b65b 100644
--- a/tests/docroot/www/Makefile.am
+++ b/tests/docroot/www/Makefile.am
@@ -1,5 +1,27 @@
-EXTRA_DIST=cgi.php cgi.pl index.html index.txt phpinfo.php \
- redirect.php cgi-pathinfo.pl get-env.php get-server-env.php \
- nph-status.pl prefix.fcgi get-header.pl ssi.shtml get-post-len.pl \
- exec-date.shtml 404.fcgi 404.html 404.pl send404.pl crlfcrash.pl sendfile.php
-SUBDIRS=go indexfile expire
+EXTRA_DIST=\
+ 404.fcgi \
+ 404.html \
+ 404.pl \
+ cgi-pathinfo.pl \
+ cgi.php \
+ cgi.pl \
+ crlfcrash.pl \
+ exec-date.shtml \
+ get-env.php \
+ get-header.pl \
+ get-post-len.pl \
+ get-server-env.php \
+ index.html \
+ index.txt \
+ ip.pl \
+ nph-status.pl \
+ phpinfo.php \
+ prefix.fcgi \
+ redirect.php \
+ send404.pl \
+ sendfile.php \
+ ssi.shtml
+SUBDIRS=\
+ expire \
+ go \
+ indexfile
View Lorry Controller Status