diff options
Diffstat (limited to 'src/include.am')
| -rw-r--r-- | src/include.am | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/src/include.am b/src/include.am index ec091e5..6e1e321 100644 --- a/src/include.am +++ b/src/include.am @@ -24,7 +24,7 @@ src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c if HAVE_ANDROID -src_conf_unittest_SOURCES+= src/common/android.c src/common/fmemopen.c +src_conf_unittest_SOURCES+= src/common/fmemopen.c endif check_PROGRAMS+= src/conf_unittest @@ -37,9 +37,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -if !HAVE_STRCHRNUL -src_conf_unittest_SOURCES+= src/common/android.c -endif check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -50,9 +47,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -if !HAVE_STRCHRNUL -src_conf_unittest_SOURCES+= src/common/android.c -endif check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -63,7 +57,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c # XXX This conditional should apply for any system where we're building # conf_unittest, but I don't know how to tell that to automake. @@ -83,7 +76,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c src_conf_unittest_SOURCES+= src/common/fmemopen.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest @@ -95,7 +87,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -120,7 +111,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -131,7 +121,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -142,7 +131,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -153,7 +141,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -194,10 +181,6 @@ endif src_tlsdated_LDADD = @SSL_LIBS@ $(RT_LIB) $(DBUS_LIBS) $(LIBEVENT_LIBS) src_tlsdated_SOURCES = src/conf.c -if HAVE_ANDROID -src_tlsdated_SOURCES+= src/common/android.c -endif - # This doesn't work on Mac OS X or FreeBSD if TARGET_LINUX src_tlsdated_SOURCES+= src/routeup.c @@ -262,9 +245,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -if !HAVE_STRCHRNUL -src_proxy_bio_unittest_SOURCES+= src/common/android.c -endif check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif @@ -284,7 +264,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c # XXX This conditional should apply for any system where we're building # proxy_bio_unittest, but I don't know how to tell that to automake. @@ -304,7 +283,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c src_proxy_bio_unittest_SOURCES+= src/common/fmemopen.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest @@ -318,7 +296,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif @@ -347,7 +324,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif @@ -360,7 +336,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif @@ -373,7 +348,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif @@ -386,7 +360,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif @@ -408,10 +381,6 @@ noinst_HEADERS+= src/conf.h noinst_HEADERS+= src/dbus.h noinst_HEADERS+= src/platform.h -if HAVE_ANDROID -noinst_HEADERS+= src/common/android.h -endif - # This is our explicit target list # We do not attempt to build with PolarSSL if !POLARSSL @@ -431,7 +400,6 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c -src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -465,7 +433,6 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c -src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest |