diff options
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 74c7ce93b..2cd8b499b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -2,13 +2,8 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtls AM_CFLAGS = \ -DPLUGINS="\"${scripts_plugins}\"" -<<<<<<< HEAD -noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql \ - thread_analysis dh_speed pubkey_speed crypt_burn -======= noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql oid2der \ thread_analysis dh_speed pubkey_speed crypt_burn fetch ->>>>>>> upstream/4.5.1 if USE_TLS noinst_PROGRAMS += tls_test @@ -22,22 +17,11 @@ bin2sql_SOURCES = bin2sql.c id2sql_SOURCES = id2sql.c key2keyid_SOURCES = key2keyid.c keyid2sql_SOURCES = keyid2sql.c -<<<<<<< HEAD -======= oid2der_SOURCES = oid2der.c ->>>>>>> upstream/4.5.1 thread_analysis_SOURCES = thread_analysis.c dh_speed_SOURCES = dh_speed.c pubkey_speed_SOURCES = pubkey_speed.c crypt_burn_SOURCES = crypt_burn.c -<<<<<<< HEAD -id2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -key2keyid_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -keyid2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -dh_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt -pubkey_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt -crypt_burn_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -======= fetch_SOURCES = fetch.c id2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la key2keyid_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la @@ -47,7 +31,6 @@ dh_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt pubkey_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt crypt_burn_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la fetch_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la ->>>>>>> upstream/4.5.1 key2keyid.o : $(top_builddir)/config.status |