Index: Makefile.in =================================================================== --- Makefile.in (revision 11044) +++ Makefile.in (working copy) @@ -23,9 +23,11 @@ VPATH = @top_srcdir@ SVN_RA_LIB_DEPS = @SVN_RA_LIB_DEPS@ +SVN_RA_LIB_INSTALL_DEPS = @SVN_RA_LIB_INSTALL_DEPS@ SVN_RA_LIB_LINK = @SVN_RA_LIB_LINK@ SVN_FS_LIB_DEPS = @SVN_FS_LIB_DEPS@ +SVN_FS_LIB_INSTALL_DEPS = @SVN_FS_LIB_INSTALL_DEPS@ SVN_FS_LIB_LINK = @SVN_FS_LIB_LINK@ DESIGN_DIR = doc/programmer/design Index: build.conf =================================================================== --- build.conf (revision 11044) +++ build.conf (working copy) @@ -146,6 +146,7 @@ libs = libsvn_subr fs-libs apr # conditionally add more dependencies add-deps = $(SVN_FS_LIB_DEPS) +add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) msvc-static = yes [libsvn_fs_base] @@ -171,6 +172,7 @@ libs = libsvn_subr ra-libs aprutil apriconv apr # conditionally add more dependencies add-deps = $(SVN_RA_LIB_DEPS) +add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS) install = lib msvc-static = yes Index: configure.in =================================================================== --- configure.in (revision 11044) +++ configure.in (working copy) @@ -592,6 +592,7 @@ AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1, [Defined if libsvn_client should link against libsvn_ra_local]) svn_ra_lib_deps="\$(RA_LOCAL_DEPS)" + svn_ra_lib_install_deps="install-ramod-lib" svn_ra_lib_link="\$(RA_LOCAL_LINK)" AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SVN, 1, @@ -603,31 +604,38 @@ AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_DAV, 1, [Defined if libsvn_client should link against libsvn_ra_dav]) svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_DAV_DEPS)" + svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-dav-lib" svn_ra_lib_link="$svn_ra_lib_link \$(RA_DAV_LINK)" fi SVN_RA_LIB_DEPS=$svn_ra_lib_deps + SVN_RA_LIB_INSTALL_DEPS=$svn_ra_lib_install_deps SVN_RA_LIB_LINK=$svn_ra_lib_link AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_FS, 1, [Defined if libsvn_fs should link against libsvn_fs_fs]) svn_fs_lib_deps="\$(FS_FS_DEPS)" + svn_fs_lib_install_deps="install-fsmod-lib" svn_fs_lib_link="\$(FS_FS_LINK)" if test "$svn_lib_berkeley_db" = "yes"; then AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1, [Defined if libsvn_fs should link against libsvn_fs_base]) svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_BASE_DEPS)" + svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-bdb-lib" svn_fs_lib_link="$svn_fs_lib_link \$(FS_BASE_LINK)" fi SVN_FS_LIB_DEPS=$svn_fs_lib_deps + SVN_FS_LIB_INSTALL_DEPS=$svn_fs_lib_install_deps SVN_FS_LIB_LINK=$svn_fs_lib_link fi AC_SUBST(SVN_RA_LIB_DEPS) +AC_SUBST(SVN_RA_LIB_INSTALL_DEPS) AC_SUBST(SVN_RA_LIB_LINK) AC_SUBST(SVN_FS_LIB_DEPS) +AC_SUBST(SVN_FS_LIB_INSTALL_DEPS) AC_SUBST(SVN_FS_LIB_LINK) Index: build/generator/gen_base.py =================================================================== --- build/generator/gen_base.py (revision 11044) +++ build/generator/gen_base.py (working copy) @@ -294,6 +294,7 @@ self.desc = options.get('description') self.path = options.get('path', '') self.add_deps = options.get('add-deps', '') + self.add_install_deps = options.get('add-install-deps', '') self.msvc_name = options.get('msvc-name') # override project name def add_dependencies(self): Index: build/generator/gen_make.py =================================================================== --- build/generator/gen_make.py (revision 11044) +++ build/generator/gen_make.py (working copy) @@ -88,6 +88,11 @@ targ_varname = string.replace(target, '-', '_') objnames = string.join(build_path_strip(path, objects)) + # Add additional install dependencies if necessary + if target_ob.add_install_deps: + self.ofile.write('install-%s: %s\n' + % (target_ob.install, target_ob.add_install_deps)) + if isinstance(target_ob, gen_base.TargetJava): self.ofile.write( '%s_DEPS = %s %s\n'