subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1514020 - /subversion/trunk/build.conf
Date Wed, 14 Aug 2013 19:56:02 GMT
Author: breser
Date: Wed Aug 14 19:56:01 2013
New Revision: 1514020

URL: http://svn.apache.org/r1514020
Log:
Followup to r1514012 to unbreak the build.

There is probably a better solution to this, but first let's fix the build.

* build.conf
  (libsvnjavahl): Unwrap the add-deps lines since it breaks the build

Modified:
    subversion/trunk/build.conf

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1514020&r1=1514019&r2=1514020&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Aug 14 19:56:01 2013
@@ -683,9 +683,7 @@ path = subversion/bindings/javahl/native
 libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff 
        libsvn_subr libsvn_fs aprutil apriconv apr java-sdk
 sources = *.cpp *.c
-add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
-           $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS)
-           $(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
+add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_remote_javah_DEPS)
$(javahl_types_javah_DEPS) $(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
 install = javahl-lib
 # need special build rule to include -I$(JDK)/include/jni.h
 compile-cmd = $(COMPILE_JAVAHL_CXX)



Mime
View raw message