mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Move security/security_test to tests/testsecurity 

https://github.com/Hamlib/Hamlib/issues/813
pull/978/head
Mike Black W9MDB 2022-02-28 12:54:04 -06:00
rodzic f51e778b1b
commit 9e2ac43631
3 zmienionych plików z 3 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
security/Makefile.am
Wyświetl plik

@ -1,17 +1,7 @@
EXTRA_DIST = sctest.c EXTRA_DIST = sctest.c
#security_test_SOURCES = security_test.c aes.h AESStringCrypt.h password.h security.h sha256.h
#security_test_LIBS = libsecurity.la
#security_test_LDFLAGS = -L.
#security_test_CFLAGS = -L. -I.
#bin_PROGRAMS = security_test
noinst_LTLIBRARIES = libsecurity.la noinst_LTLIBRARIES = libsecurity.la
#noinst_PROGRAMS = security_test
libsecurity_la_SOURCES = aes.c AESStringCrypt.c password.c security.c sha256.c aes.h AESStringCrypt.h password.h security.h sha256.h libsecurity_la_SOURCES = aes.c AESStringCrypt.c password.c security.c sha256.c aes.h AESStringCrypt.h password.h security.h sha256.h
libsecurity_la_CFLAGS = -I$(srcdir) libsecurity_la_CFLAGS = -I$(srcdir)
LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/security/libsecurity.la LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/security/libsecurity.la
#security_test_LDADD = $(LDADD)
#check_PROGRAMS = security_test

5
tests/Makefile.am
Wyświetl plik

@ -16,7 +16,7 @@ DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum
bin_PROGRAMS = rigctl rigctld rigmem rigsmtr rigswr rotctl rotctld rigctlcom ampctl ampctld $(TESTLIBUSB) bin_PROGRAMS = rigctl rigctld rigmem rigsmtr rigswr rotctl rotctld rigctlcom ampctl ampctld $(TESTLIBUSB)
check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid testsecurity
RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c uthash.h RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c uthash.h
ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c uthash.h ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c uthash.h
@ -37,7 +37,7 @@ if HAVE_LIBUSB
endif endif
# include generated include files ahead of any in sources # include generated include files ahead of any in sources
rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) $(AM_CPPFLAGS) rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) -I$(top_builddir)/security $(AM_CPPFLAGS)
# all the programs need this # all the programs need this
LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS) LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS)
@ -52,6 +52,7 @@ rigctlcom_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
if HAVE_LIBUSB if HAVE_LIBUSB
rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
endif endif
testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src -I$(top_builddir)/security
rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD) rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS) rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)

0
security/security_test.c → tests/testsecurity.c
Wyświetl plik