diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index f4c6e61..faf2a70 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,6 +56,8 @@ SVN_XML_LIBS = @SVN_XML_LIBS@ SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ SVN_LZ4_LIBS = @SVN_LZ4_LIBS@ SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@ +SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@ +SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@ LIBS = @LIBS@ @@ -78,6 +80,9 @@ datadir = @datadir@ datarootdir = @datarootdir@ localedir = @localedir@ +# where to install SVN++ +svnxx_libdir = @libdir@ + # where to install libsvn_swig_* swig_py_libdir = @libdir@ swig_pl_libdir = @libdir@ @@ -139,9 +144,8 @@ APACHE_INCLUDES = @APACHE_INCLUDES@ APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@ APACHE_LDFLAGS = @APACHE_LDFLAGS@ -SVN_USE_GOOGLEMOCK = @SVN_USE_GOOGLEMOCK@ -GOOGLEMOCK_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock/include -I@GOOGLEMOCK_SRCDIR@/googletest/include -GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock -I@GOOGLEMOCK_SRCDIR@/googletest $(GOOGLEMOCK_INCLUDES) +BOOST_TEST_CPPFLAGS = @BOOST_CPPFLAGS@ -DBOOST_TEST_DYN_LINK -DBOOST_TEST_NO_MAIN +BOOST_TEST_LDFLAGS = @BOOST_LDFLAGS@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@ SWIG = @SWIG@ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py @@ -164,7 +168,9 @@ CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/subversion/bindings/ctypes-python JAVAHL_JAR=subversion/bindings/javahl/svn-javahl.jar JAVAHL_INCLUDES= @JNI_INCLUDES@ -I$(abs_builddir)/subversion/bindings/javahl/include -CXXHL_INCLUDES = -I$(abs_srcdir)/subversion/bindings/cxxhl/include +SVN_BUILD_SVNXX = @SVN_BUILD_SVNXX@ +SVN_BUILD_SVNXX_TESTS = @SVN_BUILD_SVNXX_TESTS@ +SVNXX_INCLUDES = -I$(abs_srcdir)/subversion/bindings/cxx/include SVN_APR_CONFIG = @SVN_APR_CONFIG@ SVN_APR_INCLUDES = @SVN_APR_INCLUDES@ @@ -218,7 +224,6 @@ COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPF # special compilation for files destined for javahl (i.e. C++) COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) -COMPILE_JAVAHL_JAVAH = $(JAVAH) COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS) # On Mac OS X, export an env variable so that the tests can run without @@ -259,15 +264,15 @@ TEST_SHLIB_VAR_SWIG_RB=\ export @SVN_APR_SHLIB_PATH_VAR@; \ fi; -# special compilation for files destined for cxxhl -COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c -COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c -COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES) -o $@ -c +# special compilation for files destined for SVN++ +COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c +COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -o $@ -c LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) LINK_LIB = $(LINK) $(LT_SO_VERSION) LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) +LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared @@ -321,6 +326,8 @@ INSTALL_DATA = $(INSTALL) -m 644 INSTALL_LOCALE = $(INSTALL_DATA) INSTALL_APACHE_MODS = @INSTALL_APACHE_MODS@ +INSTALL_SVNXX_LIB = $(INSTALL_LIB) + ### this isn't correct yet INSTALL_SWIG_PY = $(INSTALL_LIB) INSTALL_SWIG_PY_LIB = $(INSTALL_LIB) @@ -393,7 +400,6 @@ JAVAC = @JAVAC@ JAVADOC = @JAVADOC@ JAVAC_FLAGS = @JAVAC_FLAGS@ JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@ -JAVAH = @JAVAH@ JAR = @JAR@ JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@ @@ -494,8 +500,8 @@ revision-install: install-static: @INSTALL_STATIC_RULES@ # JavaHL target aliases -javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-remote-javah javahl-types-javah javahl-util-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat -install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib +javahl: mkdir-init javahl-java javahl-callback-java javahl-remote-java javahl-types-java javahl-util-java javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat +install-javahl: javahl install-javahl-java install-javahl-lib javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@ clean-javahl: @@ -526,6 +532,9 @@ check-javahl: check-apache-javahl check-all-javahl: check-apache-javahl check-tigris-javahl check-deprecated-authn-javahl +check-svnxx: svnxx-tests + $(abs_builddir)/$(svnxx_tests_PATH)/svnxx-tests$(EXEEXT) + # "make check CLEANUP=true" will clean up directories for successful tests. # "make check TESTS=subversion/tests/cmdline/basic_tests.py" # will perform only basic tests (likewise for other tests). @@ -601,6 +610,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ if test "$(FSFS_DIR_DELTIFICATION)" != ""; then \ flags="--fsfs-dir-deltification $(FSFS_DIR_DELTIFICATION) $$flags";\ fi; \ + if test "$(ALLOW_REMOTE_HTTP_CONNECTION)" != ""; then \ + flags="--allow-remote-http-connection $$flags"; \ + fi; \ if test "$(SVN_BIN_DIR)" != ""; then \ flags="--bin $(SVN_BIN_DIR) $$flags"; \ fi; \ @@ -694,7 +706,8 @@ check-clean: gcov-clean subversion/tests/libsvn_diff/T1 \ subversion/tests/libsvn_diff/T2 \ subversion/tests/libsvn_diff/T3 \ - subversion/tests/svnserveautocheck.pid \ + subversion/tests/cmdline/httpd-* \ + subversion/tests/cmdline/svnserve-* \ tests.log fails.log mkdir-init: |