diff options
Diffstat (limited to 'common/Makefile.am')
| -rw-r--r-- | common/Makefile.am | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index b50223b86..7a3a7733b 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -7,12 +7,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # GnuPG is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. @@ -70,6 +70,7 @@ common_sources = \ http.c http.h \ localename.c \ session-env.c session-env.h \ + ssh-utils.c ssh-utils.h \ helpfile.c # Sources only useful without PTH. @@ -122,8 +123,21 @@ endif # # Module tests # +<<<<<<< HEAD module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil t-exechelp \ t-session-env +======= +t_jnlib_src = t-support.c t-support.h +jnlib_tests = t-stringhelp t-timestuff +if HAVE_W32_SYSTEM +jnlib_tests += t-w32-reg +endif +module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil \ + t-session-env t-openpgp-oid t-ssh-utils +if !HAVE_W32CE_SYSTEM +module_tests += t-exechelp +endif +>>>>>>> New functions to compute an ssh style fingerprint. module_maint_tests = t-helpfile t-b64 t_common_ldadd = libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a \ @@ -138,4 +152,9 @@ t_sexputil_LDADD = $(t_common_ldadd) t_b64_LDADD = $(t_common_ldadd) t_exechelp_LDADD = $(t_common_ldadd) t_session_env_LDADD = $(t_common_ldadd) +<<<<<<< HEAD +======= +t_openpgp_oid_LDADD = $(t_common_ldadd) +t_ssh_utils_LDADD = $(t_common_ldadd) +>>>>>>> New functions to compute an ssh style fingerprint. |