$NetBSD: patch-aa,v 1.9 2003/12/03 15:20:44 epg Exp $

--- build-outputs.mk.orig	Thu Nov 13 22:38:59 2003
+++ build-outputs.mk
@@ -59,10 +59,10 @@ libsvn_swig_perl_OBJECTS = swigutil_pl.l
 subversion/bindings/swig/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
 	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_perl-1.la $(libsvn_swig_perl_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)
 
 perl_client_DEPS = mkdir-init subversion/bindings/swig/perl/svn_client.lo subversion/bindings/swig/libsvn_swig_perl-1.la subversion/libsvn_client/libsvn_client-1.la
 perl_client_OBJECTS = svn_client.lo
@@ -104,40 +104,40 @@ perl_runtime_OBJECTS = swigpl.lo
 subversion/bindings/swig/perl/swigpl.la: $(perl_runtime_DEPS)
 	cd subversion/bindings/swig/perl && $(LINK_PL_WRAPPER) -o swigpl.la $(perl_runtime_OBJECTS)  $(LIBS)
 
-python_client_DEPS = mkdir-init subversion/bindings/swig/python/svn_client.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_client/libsvn_client-1.la
+python_client_DEPS = mkdir-init 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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(python_client_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la -lsvn_client-1 $(LIBS)
 
-python_core_DEPS = mkdir-init subversion/bindings/swig/python/core.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_subr/libsvn_subr-1.la
+python_core_DEPS = mkdir-init 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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(python_core_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la -lsvn_subr-1 $(SVN_APR_LIBS) $(LIBS)
 
-python_delta_DEPS = mkdir-init subversion/bindings/swig/python/svn_delta.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_delta/libsvn_delta-1.la
+python_delta_DEPS = mkdir-init 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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(python_delta_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la -lsvn_delta-1 $(LIBS)
 
-python_fs_DEPS = mkdir-init subversion/bindings/swig/python/svn_fs.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_fs/libsvn_fs-1.la
+python_fs_DEPS = mkdir-init 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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(python_fs_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la -lsvn_fs-1 $(LIBS)
 
-python_ra_DEPS = mkdir-init subversion/bindings/swig/python/svn_ra.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_ra/libsvn_ra-1.la
+python_ra_DEPS = mkdir-init 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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(python_ra_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la -lsvn_ra-1 $(LIBS)
 
-python_repos_DEPS = mkdir-init subversion/bindings/swig/python/svn_repos.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_repos/libsvn_repos-1.la
+python_repos_DEPS = mkdir-init 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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_repos/libsvn_repos-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(python_repos_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la -lsvn_repos-1 $(LIBS)
 
-python_wc_DEPS = mkdir-init subversion/bindings/swig/python/svn_wc.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_wc/libsvn_wc-1.la
+python_wc_DEPS = mkdir-init 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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la $(LIBS)
+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la -lsvn_wc-1 $(LIBS)
 
 python_runtime_DEPS = mkdir-init subversion/bindings/swig/python/swigpy.lo
 python_runtime_OBJECTS = swigpy.lo
@@ -204,15 +204,15 @@ libsvn_wc_OBJECTS = adm_crawler.lo adm_f
 subversion/libsvn_wc/libsvn_wc-1.la: $(libsvn_wc_DEPS)
 	cd subversion/libsvn_wc && $(LINK) -o libsvn_wc-1.la $(libsvn_wc_OBJECTS) ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la ../../subversion/libsvn_diff/libsvn_diff-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)
 
 svnadmin_DEPS =  subversion/svnadmin/main.o 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
 svnadmin_OBJECTS = main.o
