$NetBSD: patch-aa,v 1.4 2003/06/18 13:26:26 epg Exp $

--- build-outputs.mk.orig	Mon Jun 16 08:27:37 2003
+++ build-outputs.mk
@@ -109,10 +109,10 @@ libsvn_swig_java_OBJECTS = swigutil_java
 subversion/bindings/swig/libsvn_swig_java-1.la: $(libsvn_swig_java_DEPS)
 	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_java-1.la $(libsvn_swig_java_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
-libsvn_swig_py_DEPS = subversion/bindings/swig/swigutil_py.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_delta/libsvn_delta-1.la 
+libsvn_swig_py_DEPS = subversion/bindings/swig/swigutil_py.lo
 libsvn_swig_py_OBJECTS = swigutil_py.lo
 subversion/bindings/swig/libsvn_swig_py-1.la: $(libsvn_swig_py_DEPS)
-	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_py-1.la $(libsvn_swig_py_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_py-1.la $(libsvn_swig_py_OBJECTS) -lsvn_subr-1 -lsvn_delta-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
 libsvn_test_DEPS = subversion/tests/svn_test_editor.lo subversion/tests/svn_tests_main.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
 libsvn_test_OBJECTS = svn_test_editor.lo svn_tests_main.lo
@@ -134,15 +134,15 @@ md5args_OBJECTS = md5args.o
 subversion/tests/libsvn_repos/md5args$(EXEEXT): $(md5args_DEPS)
 	cd subversion/tests/libsvn_repos && $(LINK) -o md5args$(EXEEXT) $(md5args_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
-mod_authz_svn_DEPS = subversion/mod_authz_svn/mod_authz_svn.lo subversion/libsvn_subr/libsvn_subr-1.la 
+mod_authz_svn_DEPS = subversion/mod_authz_svn/mod_authz_svn.lo
 mod_authz_svn_OBJECTS = mod_authz_svn.lo
 subversion/mod_authz_svn/mod_authz_svn.la: $(mod_authz_svn_DEPS)
-	cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(mod_authz_svn_OBJECTS) ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
+	cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(mod_authz_svn_OBJECTS) -lsvn_subr-1 $(LIBS)
 
-mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
+mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
 mod_dav_svn_OBJECTS = activity.lo deadprops.lo liveprops.lo log.lo merge.lo mod_dav_svn.lo repos.lo update.lo util.lo version.lo
 subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS)
-	cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(mod_dav_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
+	cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(mod_dav_svn_OBJECTS) -lsvn_repos-1 -lsvn_fs-1 -lsvn_delta-1 -lsvn_subr-1 $(LIBS)
 
 path_test_DEPS = subversion/tests/libsvn_subr/path-test.o subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la 
 path_test_OBJECTS = path-test.o
@@ -219,40 +219,40 @@ java_wc_OBJECTS = svn_wc.lo
 subversion/bindings/swig/java/_wc.la: $(java_wc_DEPS)
 	cd subversion/bindings/swig/java && $(LINK_JAVA_WRAPPER) -o _wc.la $(java_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/bindings/swig/libsvn_swig_java-1.la $(LIBS)
 
-python_client_DEPS = subversion/bindings/swig/python/svn_client.lo subversion/libsvn_client/libsvn_client-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+python_client_DEPS = subversion/bindings/swig/python/svn_client.lo subversion/bindings/swig/libsvn_swig_py-1.la 
 python_client_OBJECTS = svn_client.lo
 subversion/bindings/swig/python/_client.la: $(python_client_DEPS)
-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(python_client_OBJECTS) ../../../../subversion/libsvn_client/libsvn_client-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(python_client_OBJECTS) -lsvn_client-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 
-python_core_DEPS = subversion/bindings/swig/python/core.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+python_core_DEPS = subversion/bindings/swig/python/core.lo subversion/bindings/swig/libsvn_swig_py-1.la 
 python_core_OBJECTS = core.lo
 subversion/bindings/swig/python/_core.la: $(python_core_DEPS)
-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(python_core_OBJECTS) ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(python_core_OBJECTS) -lsvn_subr-1 $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 
-python_delta_DEPS = subversion/bindings/swig/python/svn_delta.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+python_delta_DEPS = subversion/bindings/swig/python/svn_delta.lo subversion/bindings/swig/libsvn_swig_py-1.la 
 python_delta_OBJECTS = svn_delta.lo
 subversion/bindings/swig/python/_delta.la: $(python_delta_DEPS)
-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(python_delta_OBJECTS) ../../../../subversion/libsvn_delta/libsvn_delta-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(python_delta_OBJECTS) -lsvn_delta-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 
-python_fs_DEPS = subversion/bindings/swig/python/svn_fs.lo subversion/libsvn_fs/libsvn_fs-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+python_fs_DEPS = subversion/bindings/swig/python/svn_fs.lo subversion/bindings/swig/libsvn_swig_py-1.la 
 python_fs_OBJECTS = svn_fs.lo
 subversion/bindings/swig/python/_fs.la: $(python_fs_DEPS)
-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(python_fs_OBJECTS) ../../../../subversion/libsvn_fs/libsvn_fs-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(python_fs_OBJECTS) -lsvn_fs-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 
-python_ra_DEPS = subversion/bindings/swig/python/svn_ra.lo subversion/libsvn_ra/libsvn_ra-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+python_ra_DEPS = subversion/bindings/swig/python/svn_ra.lo subversion/bindings/swig/libsvn_swig_py-1.la 
 python_ra_OBJECTS = svn_ra.lo
 subversion/bindings/swig/python/_ra.la: $(python_ra_DEPS)
-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(python_ra_OBJECTS) ../../../../subversion/libsvn_ra/libsvn_ra-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(python_ra_OBJECTS) -lsvn_ra-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 
-python_repos_DEPS = subversion/bindings/swig/python/svn_repos.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+python_repos_DEPS = subversion/bindings/swig/python/svn_repos.lo subversion/bindings/swig/libsvn_swig_py-1.la 
 python_repos_OBJECTS = svn_repos.lo
 subversion/bindings/swig/python/_repos.la: $(python_repos_DEPS)
-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(python_repos_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(python_repos_OBJECTS) -lsvn_repos-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 
-python_wc_DEPS = subversion/bindings/swig/python/svn_wc.lo subversion/libsvn_wc/libsvn_wc-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+python_wc_DEPS = subversion/bindings/swig/python/svn_wc.lo subversion/bindings/swig/libsvn_swig_py-1.la 
 python_wc_OBJECTS = svn_wc.lo
 subversion/bindings/swig/python/_wc.la: $(python_wc_DEPS)
-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) -lsvn_wc-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 
 svn_DEPS = subversion/clients/cmdline/add-cmd.o subversion/clients/cmdline/cat-cmd.o subversion/clients/cmdline/checkout-cmd.o subversion/clients/cmdline/cleanup-cmd.o subversion/clients/cmdline/commit-cmd.o subversion/clients/cmdline/copy-cmd.o subversion/clients/cmdline/delete-cmd.o subversion/clients/cmdline/diff-cmd.o subversion/clients/cmdline/export-cmd.o subversion/clients/cmdline/feedback.o subversion/clients/cmdline/help-cmd.o subversion/clients/cmdline/import-cmd.o subversion/clients/cmdline/info-cmd.o subversion/clients/cmdline/log-cmd.o subversion/clients/cmdline/ls-cmd.o subversion/clients/cmdline/main.o subversion/clients/cmdline/merge-cmd.o subversion/clients/cmdline/mkdir-cmd.o subversion/clients/cmdline/move-cmd.o subversion/clients/cmdline/prompt.o subversion/clients/cmdline/propdel-cmd.o subversion/clients/cmdline/propedit-cmd.o subversion/clients/cmdline/propget-cmd.o subversion/clients/cmdline/proplist-cmd.o subversion/clients/cmdline/props.o subversion/clients/cmdline/propset-cmd.o subversion/clients/cmdline/resolve-cmd.o subversion/clients/cmdline/revert-cmd.o subversion/clients/cmdline/status-cmd.o subversion/clients/cmdline/status.o subversion/clients/cmdline/switch-cmd.o subversion/clients/cmdline/update-cmd.o subversion/clients/cmdline/util.o subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
 svn_OBJECTS = add-cmd.o cat-cmd.o checkout-cmd.o cleanup-cmd.o commit-cmd.o copy-cmd.o delete-cmd.o diff-cmd.o export-cmd.o feedback.o help-cmd.o import-cmd.o info-cmd.o log-cmd.o ls-cmd.o main.o merge-cmd.o mkdir-cmd.o move-cmd.o prompt.o propdel-cmd.o propedit-cmd.o propget-cmd.o proplist-cmd.o props.o propset-cmd.o resolve-cmd.o revert-cmd.o status-cmd.o status.o switch-cmd.o update-cmd.o util.o