httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r153666 - in httpd/apreq/branches/multi-env-unstable: include/ library/ library/t/ module/ module/apache2/ module/apache2/Makefile.am
Date Sun, 13 Feb 2005 20:58:47 GMT
Author: joes
Date: Sun Feb 13 12:58:46 2005
New Revision: 153666

URL: http://svn.apache.org/viewcvs?view=rev&rev=153666
Log:

Continue reorganization around include/, library/, and module/ dirs,
following this discussion-

    http://marc.theaimsgroup.com/?t=110792260400001&r=1&w=2

Added:
    httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am
Modified:
    httpd/apreq/branches/multi-env-unstable/include/   (props changed)
    httpd/apreq/branches/multi-env-unstable/library/   (props changed)
    httpd/apreq/branches/multi-env-unstable/library/t/   (props changed)
    httpd/apreq/branches/multi-env-unstable/module/   (props changed)
    httpd/apreq/branches/multi-env-unstable/module/apache2/   (props changed)

Propchange: httpd/apreq/branches/multi-env-unstable/include/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 13 12:58:46 2005
@@ -0,0 +1,5 @@
+apreq_config.h.in
+apreq_config.h
+groups.dox
+stamp-h.in
+stamp-h

Propchange: httpd/apreq/branches/multi-env-unstable/library/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 13 12:58:46 2005
@@ -0,0 +1,4 @@
+.deps
+.libs
+Makefile.in
+Makefile

Propchange: httpd/apreq/branches/multi-env-unstable/library/t/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Feb 13 12:58:46 2005
@@ -4,3 +4,11 @@
 Makefile.in
 testall
 *.a
+cookie.t
+cookie
+params.t
+params
+parsers.t
+parsers
+version.t
+version

Propchange: httpd/apreq/branches/multi-env-unstable/module/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 13 12:58:46 2005
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile.in
+Makefile
+test_cgi

Propchange: httpd/apreq/branches/multi-env-unstable/module/apache2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 13 12:58:46 2005
@@ -0,0 +1,4 @@
+.deps
+.libs
+Makefile.in
+Makefile

Added: httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am?view=auto&rev=153666
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am (added)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am Sun Feb 13 12:58:46
2005
@@ -0,0 +1,41 @@
+INCLUDES = -I../../include @APACHE2_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@
+LIBS = ../../library/lib@APREQ_LIBNAME@.la @APR_LTLIBS@ @APU_LTLIBS@
+LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
+TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
+pkgincludedir = $(includedir)/@APREQ_LIBNAME@
+pkginclude_HEADERS = apreq_module_apache2.h
+mod_apreq2_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath `@APACHE2_APXS@ -q
LIBEXECDIR`
+
+if MAINTAINER_MODE
+    AM_CPPFLAGS= -DAP_HAVE_DESIGNATED_INITIALIZER
+endif
+
+if BUILD_HTTPD
+
+# mod_apreq.c needs to be built from httpd-2.X, e.g.
+#
+# % cd ../httpd-2.X;
+# % ./configure --with-module=filters:../httpd-apreq-2/module/apache2/mod_apreq2.c ...
+#
+# See the INSTALL file for details.
+
+@APACHE2_HTTPD@:
+	cd @APACHE2_SRC@ && $(MAKE)
+
+all-local: @APACHE2_HTTPD@
+
+t/TEST : Makefile.am t/TEST.PL
+	@PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -httpd @APACHE2_HTTPD@
+
+else
+
+noinst_LTLIBRARIES = mod_apreq2.la
+mod_apreq2_la_SOURCES = handle.c
+
+install-exec-local: mod_apreq.la
+	@APACHE2_APXS@ -i -a -n apreq2 mod_apreq2.la
+
+t/TEST : Makefile.am t/TEST.PL
+	@PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -apxs @APACHE2_APXS@
+
+endif



Mime
View raw message