svn commit: r905665 - in /subversion/trunk: Makefile.in build.conf

[hw...@apache.org]

Author: hwright
Date: Tue Feb  2 15:03:28 2010
New Revision: 905665

URL: http://svn.apache.org/viewvc?rev=905665&view=rev
Log:
JavaHL: More monkeying with the build system, this time to make sure the
libraries and headers are generated for the new packages.

(Note: Currently, we're calling the new stuff 'javahl-compat', but at some
point, the build targets will change so that the old stuff, which is the
compatibility wrapper, will use the term 'javahl-compat')

* Makefile.in:
  Add the javahl-compat target explicitly, as well as its dependencies.

* build.conf
  (javahl-compat-java): Renamed from javahl-compat.
  (javahl-compat-javah): New section.

Modified:
    subversion/trunk/Makefile.in
    subversion/trunk/build.conf

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=905665&r1=905664&r2=905665&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Feb  2 15:03:28 2010
@@ -424,6 +424,7 @@
 # JavaHL target aliases
 javahl: mkdir-init javahl-java javahl-javah javahl-lib @JAVAHL_TESTS_TARGET@
 install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
+javahl-compat: mkdir-init javahl-compat-java javahl-compat-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat-tests
 
 clean-javahl:
 	rm -rf $(javahl_java_PATH) $(javahl_javah_PATH) @JAVAHL_OBJDIR@

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=905665&r1=905664&r2=905665&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Feb  2 15:03:28 2010
@@ -527,7 +527,7 @@
 #
 # JavaHL targets
 #
-[javahl-compat]
+[javahl-compat-java]
 type = java
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl
   subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
@@ -537,7 +537,6 @@
 link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
 package-roots = org
-add-deps = javahl
 
 [javahl-java]
 type = java
@@ -583,6 +582,17 @@
 install = javahl-javah
 link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
 
+[javahl-compat-javah]
+type = javah 
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl
+classes = subversion/bindings/javahl/classes
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl
+sources = *.java
+add-deps = $(javahl_java_DEPS)
+install = javahl-javah
+link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+
 [libsvnjavahl]
 description = Subversion Java HighLevel binding
 type = lib