You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@commons.apache.org by je...@apache.org on 2003/09/17 09:04:17 UTC
svn commit: rev 33 - in commons/serf/trunk: . base base/buckets base/filters include
Author: jerenkrantz
Date: Sun Nov 24 00:55:39 2002
New Revision: 33
Added:
commons/serf/trunk/base/buckets/.cvsignore
commons/serf/trunk/base/buckets/Makefile.in
commons/serf/trunk/base/filters/.cvsignore
commons/serf/trunk/base/filters/Makefile.in
Modified:
commons/serf/trunk/Makefile.in
commons/serf/trunk/base/Makefile.in
commons/serf/trunk/configure.in
commons/serf/trunk/include/serf_version.h
Log:
Fix build system to work with new filters and buckets directories.
(Bump to serf 0.0.5.)
Modified: commons/serf/trunk/Makefile.in
==============================================================================
--- commons/serf/trunk/Makefile.in (original)
+++ commons/serf/trunk/Makefile.in Sun Nov 24 00:55:39 2002
@@ -7,7 +7,7 @@
SERF_MAJOR_VERSION=@SERF_MAJOR_VERSION@
-SUBDIRS = @SERF_SUBDIRS@ base
+SUBDIRS = @SERF_SUBDIRS@ base base/filters base/buckets
TARGET_LIB = lib@SERF_LIBNAME@.la
Modified: commons/serf/trunk/base/Makefile.in
==============================================================================
--- commons/serf/trunk/base/Makefile.in (original)
+++ commons/serf/trunk/base/Makefile.in Sun Nov 24 00:55:39 2002
@@ -3,11 +3,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
-TARGETS = serf_connection.lo serf_request.lo serf_open_url.lo serf_filters.lo \
- serf_bucket_status.lo serf_bucket_header.lo \
- serf_bucket_authentication.lo serf_bucket_request_line.lo \
- serf_filter_http.lo serf_filter_socket.lo \
- @SSL_BASE_OBJECTS@ @DEFLATE_BASE_OBJECTS@
+TARGETS = serf_connection.lo serf_request.lo serf_open_url.lo serf_filters.lo
INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include
Added: commons/serf/trunk/base/buckets/.cvsignore
==============================================================================
--- (empty file)
+++ commons/serf/trunk/base/buckets/.cvsignore Sun Nov 24 00:55:39 2002
@@ -0,0 +1,5 @@
+.deps
+.libs
+*.lo
+*.la
+Makefile
Added: commons/serf/trunk/base/buckets/Makefile.in
==============================================================================
--- (empty file)
+++ commons/serf/trunk/base/buckets/Makefile.in Sun Nov 24 00:55:39 2002
@@ -0,0 +1,13 @@
+top_builddir = @abs_blddir@
+builddir = $(shell pwd)
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+TARGETS = serf_bucket_status.lo serf_bucket_header.lo \
+ serf_bucket_authentication.lo serf_bucket_request_line.lo \
+ @SSL_BUCKETS_OBJECTS@
+
+INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
Added: commons/serf/trunk/base/filters/.cvsignore
==============================================================================
--- (empty file)
+++ commons/serf/trunk/base/filters/.cvsignore Sun Nov 24 00:55:39 2002
@@ -0,0 +1,5 @@
+.deps
+.libs
+*.lo
+*.la
+Makefile
Added: commons/serf/trunk/base/filters/Makefile.in
==============================================================================
--- (empty file)
+++ commons/serf/trunk/base/filters/Makefile.in Sun Nov 24 00:55:39 2002
@@ -0,0 +1,12 @@
+top_builddir = @abs_blddir@
+builddir = $(shell pwd)
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+TARGETS = serf_filter_http.lo serf_filter_socket.lo \
+ @SSL_FILTERS_OBJECTS@ @DEFLATE_FILTERS_OBJECTS@
+
+INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
Modified: commons/serf/trunk/configure.in
==============================================================================
--- commons/serf/trunk/configure.in (original)
+++ commons/serf/trunk/configure.in Sun Nov 24 00:55:39 2002
@@ -129,8 +129,10 @@
fi
fi
])
- SSL_BASE_OBJECTS="serf_filter_ssl.lo serf_bucket_ssl.lo"
- AC_SUBST(SSL_BASE_OBJECTS)
+ SSL_BUCKETS_OBJECTS="serf_bucket_ssl.lo"
+ SSL_FILTERS_OBJECTS="serf_filter_ssl.lo"
+ AC_SUBST(SSL_BUCKETS_OBJECTS)
+ AC_SUBST(SSL_FILTERS_OBJECTS)
fi
AC_ARG_WITH(z, [--with-z=DIR use a specific zlib library],
@@ -178,8 +180,8 @@
[AC_MSG_RESULT(found)
AC_CHECK_HEADERS(zutil.h)
LIBTOOL_LIBS="$LIBTOOL_LIBS -lz"
- DEFLATE_BASE_OBJECTS="serf_filter_deflate.lo"
- AC_SUBST(DEFLATE_BASE_OBJECTS)],
+ DEFLATE_FILTERS_OBJECTS="serf_filter_deflate.lo"
+ AC_SUBST(DEFLATE_FILTERS_OBJECTS)],
[AC_MSG_RESULT(not found)
serf_has_zlib=0
INCLUDES=$serf_save_includes
@@ -280,4 +282,4 @@
dnl Makefile outputs
dnl Note: There can only be one AC_OUTPUT command.
-AC_OUTPUT(Makefile base/Makefile build/rules.mk build/config_vars.mk test/Makefile include/serf_config.h)
+AC_OUTPUT(Makefile base/Makefile base/buckets/Makefile base/filters/Makefile build/rules.mk build/config_vars.mk test/Makefile include/serf_config.h)
Modified: commons/serf/trunk/include/serf_version.h
==============================================================================
--- commons/serf/trunk/include/serf_version.h (original)
+++ commons/serf/trunk/include/serf_version.h Sun Nov 24 00:55:39 2002
@@ -99,7 +99,7 @@
#define SERF_MINOR_VERSION 0
/** patch level */
-#define SERF_PATCH_VERSION 4
+#define SERF_PATCH_VERSION 5
/**
* This symbol is defined for internal, "development" copies of Serf. This