geoip2_c 0.3.2 → 0.3.4

data/ext/geoip2/libmaxminddb/bin/mmdblookup.c

@@ -4,6 +4,10 @@
 #include "maxminddb.h"
 #include <errno.h>
 #include <getopt.h>
+#ifndef _WIN32
+#include <pthread.h>
+#endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,16 +22,27 @@
 #include <unistd.h>
 #endif
 
-#define LOCAL
+#define LOCAL static
+#define NO_PROTO
 
 /* *INDENT-OFF* */
 /* --prototypes automatically generated by dev-bin/regen-prototypes.pl - don't remove this comment */
 LOCAL void usage(char *program, int exit_code, const char *error);
-LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
-                               char **ip_address, int *verbose, int *iterations,
-                               int *lookup_path_length);
+LOCAL const char **get_options(
+    int argc,
+    char **argv,
+    char **mmdb_file,
+    char **ip_address,
+    int *verbose,
+    int *iterations,
+    int *lookup_path_length,
+    int *const thread_count,
+    char **const ip_file);
 LOCAL MMDB_s open_or_die(const char *fname);
 LOCAL void dump_meta(MMDB_s *mmdb);
+LOCAL bool lookup_from_file(MMDB_s *const mmdb,
+                            char const *const ip_file,
+                            bool const dump);
 LOCAL int lookup_and_print(MMDB_s *mmdb, const char *ip_address,
                            const char **lookup_path,
                            int lookup_path_length);
@@ -37,6 +52,17 @@ LOCAL void random_ipv4(char *ip);
 /* --prototypes end - don't remove this comment-- */
 /* *INDENT-ON* */
 
+#ifndef _WIN32
+// These aren't with the automatically generated prototypes as we'd lose the
+// enclosing macros.
+static bool start_threaded_benchmark(
+    MMDB_s *const mmdb,
+    int const thread_count,
+    int const iterations);
+static long double get_time(void);
+static void *thread(void *arg);
+#endif
+
 int main(int argc, char **argv)
 {
     char *mmdb_file = NULL;
@@ -44,10 +70,12 @@ int main(int argc, char **argv)
     int verbose = 0;
     int iterations = 0;
     int lookup_path_length = 0;
+    int thread_count = 0;
+    char *ip_file = NULL;
 
     const char **lookup_path =
         get_options(argc, argv, &mmdb_file, &ip_address, &verbose, &iterations,
-                    &lookup_path_length);
+                    &lookup_path_length, &thread_count, &ip_file);
 
     MMDB_s mmdb = open_or_die(mmdb_file);
 
@@ -55,12 +83,43 @@ int main(int argc, char **argv)
         dump_meta(&mmdb);
     }
 
+    // The benchmarking and lookup from file modes are hidden features mainly
+    // intended for development right now. This means there are several flags
+    // that exist but are intentionally not mentioned in the usage or man page.
+
+    // The lookup from file mode may be useful to expose publicly in the usage,
+    // but we should have it respect the lookup_path functionality if we do so.
+    if (ip_file) {
+        free(lookup_path);
+        if (!lookup_from_file(&mmdb, ip_file, verbose == 1)) {
+            MMDB_close(&mmdb);
+            return 1;
+        }
+        MMDB_close(&mmdb);
+        return 0;
+    }
+
     if (0 == iterations) {
         exit(lookup_and_print(&mmdb, ip_address, lookup_path,
                               lookup_path_length));
-    } else {
-        exit(benchmark(&mmdb, iterations));
     }
+
+    free(lookup_path);
+
+    srand( time(NULL) );
+
+#ifndef _WIN32
+    if (thread_count > 0) {
+        if (!start_threaded_benchmark(&mmdb, thread_count, iterations)) {
+            MMDB_close(&mmdb);
+            exit(1);
+        }
+        MMDB_close(&mmdb);
+        exit(0);
+    }
+#endif
+
+    exit(benchmark(&mmdb, iterations));
 }
 
 LOCAL void usage(char *program, int exit_code, const char *error)
@@ -116,9 +175,16 @@ LOCAL void usage(char *program, int exit_code, const char *error)
     exit(exit_code);
 }
 
-LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
-                               char **ip_address, int *verbose, int *iterations,
-                               int *lookup_path_length)
+LOCAL const char **get_options(
+    int argc,
+    char **argv,
+    char **mmdb_file,
+    char **ip_address,
+    int *verbose,
+    int *iterations,
+    int *lookup_path_length,
+    int *const thread_count,
+    char **const ip_file)
 {
     static int help = 0;
     static int version = 0;
@@ -130,13 +196,22 @@ LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
             { "verbose",   no_argument,       0, 'v' },
             { "version",   no_argument,       0, 'n' },
             { "benchmark", required_argument, 0, 'b' },
+#ifndef _WIN32
+            { "threads",   required_argument, 0, 't' },
+#endif
+            { "ip-file",   required_argument, 0, 'I' },
             { "help",      no_argument,       0, 'h' },
             { "?",         no_argument,       0, 1   },
             { 0,           0,                 0, 0   }
         };
 
         int opt_index;
-        int opt_char = getopt_long(argc, argv, "f:i:b:vnh?", options,
+#ifdef _WIN32
+        char const * const optstring = "f:i:b:I:vnh?";
+#else
+        char const * const optstring = "f:i:b:t:I:vnh?";
+#endif
+        int opt_char = getopt_long(argc, argv, optstring, options,
                                    &opt_index);
 
         if (-1 == opt_char) {
@@ -155,6 +230,10 @@ LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
             *iterations = strtol(optarg, NULL, 10);
         } else if ('h' == opt_char || '?' == opt_char) {
             help = 1;
+        } else if (opt_char == 't') {
+            *thread_count = strtol(optarg, NULL, 10);
+        } else if (opt_char == 'I') {
+            *ip_file = optarg;
         }
     }
 
@@ -179,7 +258,7 @@ LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
         usage(program, 1, "You must provide a filename with --file");
     }
 
-    if (NULL == *ip_address && *iterations == 0) {
+    if (*ip_address == NULL && *iterations == 0 && !*ip_file) {
         usage(program, 1, "You must provide an IP address with --ip");
     }
 
@@ -229,8 +308,8 @@ LOCAL void dump_meta(MMDB_s *mmdb)
                             "    Languages:     ";
 
     char date[40];
-    strftime(date, 40, "%F %T UTC",
-             gmtime((const time_t *)&mmdb->metadata.build_epoch));
+    const time_t epoch = (const time_t)mmdb->metadata.build_epoch;
+    strftime(date, 40, "%F %T UTC", gmtime(&epoch));
 
     fprintf(stdout, meta_dump,
             mmdb->metadata.node_count,
@@ -259,6 +338,109 @@ LOCAL void dump_meta(MMDB_s *mmdb)
     fprintf(stdout, "\n");
 }
 
+// The input file should have one IP per line.
+//
+// We look up each IP.
+//
+// If dump is true, we dump the data for each IP to stderr. This is useful for
+// comparison in that you can dump out the data for the IPs before and after
+// making changes. It goes to stderr rather than stdout so that the report does
+// not get included in what you will compare (since it will almost always be
+// different).
+//
+// In addition to being useful for comparisons, this function provides a way to
+// have a more deterministic set of lookups for benchmarking.
+LOCAL bool lookup_from_file(MMDB_s *const mmdb,
+                            char const *const ip_file,
+                            bool const dump)
+{
+    FILE *const fh = fopen(ip_file, "r");
+    if (!fh) {
+        fprintf(stderr, "fopen(): %s: %s\n", ip_file, strerror(errno));
+        return false;
+    }
+
+    clock_t const clock_start = clock();
+    char buf[1024] = { 0 };
+    // I'd normally use uint64_t, but support for it is optional in C99.
+    unsigned long long i = 0;
+    while (1) {
+        if (fgets(buf, sizeof(buf), fh) == NULL) {
+            if (!feof(fh)) {
+                fprintf(stderr, "fgets(): %s\n", strerror(errno));
+                fclose(fh);
+                return false;
+            }
+            if (fclose(fh) != 0) {
+                fprintf(stderr, "fclose(): %s\n", strerror(errno));
+                return false;
+            }
+            break;
+        }
+
+        char *ptr = buf;
+        while (*ptr != '\0') {
+            if (*ptr == '\n') {
+                *ptr = '\0';
+                break;
+            }
+            ptr++;
+        }
+        if (strlen(buf) == 0) {
+            continue;
+        }
+
+        i++;
+
+        MMDB_lookup_result_s result = lookup_or_die(mmdb, buf);
+        if (!result.found_entry) {
+            continue;
+        }
+
+        MMDB_entry_data_list_s *entry_data_list = NULL;
+        int const status = MMDB_get_entry_data_list(&result.entry,
+                                                    &entry_data_list);
+        if (status != MMDB_SUCCESS) {
+            fprintf(stderr, "MMDB_get_entry_data_list(): %s\n",
+                    MMDB_strerror(status));
+            fclose(fh);
+            MMDB_free_entry_data_list(entry_data_list);
+            return false;
+        }
+
+        if (!entry_data_list) {
+            fprintf(stderr, "entry_data_list is NULL\n");
+            fclose(fh);
+            return false;
+        }
+
+        if (dump) {
+            fprintf(stdout, "%s:\n", buf);
+            int const status = MMDB_dump_entry_data_list(stderr,
+                                                         entry_data_list, 0);
+            if (status != MMDB_SUCCESS) {
+                fprintf(stderr, "MMDB_dump_entry_data_list(): %s\n",
+                        MMDB_strerror(status));
+                fclose(fh);
+                MMDB_free_entry_data_list(entry_data_list);
+                return false;
+            }
+        }
+
+        MMDB_free_entry_data_list(entry_data_list);
+    }
+
+    clock_t const clock_diff = clock() - clock_start;
+    double const seconds = (double)clock_diff / CLOCKS_PER_SEC;
+
+    fprintf(
+        stdout,
+        "Looked up %llu addresses in %.2f seconds. %.2f lookups per second.\n",
+        i, seconds, i / seconds);
+
+    return true;
+}
+
 LOCAL int lookup_and_print(MMDB_s *mmdb, const char *ip_address,
                            const char **lookup_path,
                            int lookup_path_length)
@@ -324,7 +506,6 @@ LOCAL int benchmark(MMDB_s *mmdb, int iterations)
     char ip_address[16];
     int exit_code = 0;
 
-    srand( time(NULL) );
     clock_t time = clock();
 
     for (int i = 0; i < iterations; i++) {
@@ -395,3 +576,140 @@ LOCAL void random_ipv4(char *ip)
     snprintf(ip, 16, "%u.%u.%u.%u",
              *bytes, *(bytes + 1), *(bytes + 2), *(bytes + 3));
 }
+
+#ifndef _WIN32
+struct thread_info {
+    pthread_t id;
+    int num;
+    MMDB_s *mmdb;
+    int iterations;
+};
+
+NO_PROTO static bool start_threaded_benchmark(
+    MMDB_s *const mmdb,
+    int const thread_count,
+    int const iterations)
+{
+    struct thread_info *const tinfo = calloc(thread_count,
+                                             sizeof(struct thread_info));
+    if (!tinfo) {
+        fprintf(stderr, "calloc(): %s\n", strerror(errno));
+        return false;
+    }
+
+    // Using clock() isn't appropriate for multiple threads. It's CPU time, not
+    // wall time.
+    long double const start_time = get_time();
+    if (start_time == -1) {
+        return false;
+    }
+
+    for (int i = 0; i < thread_count; i++) {
+        tinfo[i].num = i;
+        tinfo[i].mmdb = mmdb;
+        tinfo[i].iterations = iterations;
+
+        if (pthread_create(&tinfo[i].id, NULL, &thread, &tinfo[i]) != 0) {
+            fprintf(stderr, "pthread_create() failed\n");
+            free(tinfo);
+            return false;
+        }
+    }
+
+    for (int i = 0; i < thread_count; i++) {
+        if (pthread_join(tinfo[i].id, NULL) != 0) {
+            fprintf(stderr, "pthread_join() failed\n");
+            free(tinfo);
+            return false;
+        }
+    }
+
+    free(tinfo);
+
+    long double const end_time = get_time();
+    if (end_time == -1) {
+        return false;
+    }
+
+    long double const elapsed = end_time - start_time;
+    unsigned long long const total_ips = iterations * thread_count;
+    long double rate = total_ips;
+    if (elapsed != 0) {
+        rate = total_ips / elapsed;
+    }
+
+    fprintf(
+        stdout,
+        "Looked up %llu addresses using %d threads in %.2Lf seconds. %.2Lf lookups per second.\n",
+        total_ips, thread_count, elapsed, rate);
+
+    return true;
+}
+
+NO_PROTO static long double get_time(void)
+{
+    // clock_gettime() is not present on OSX until 10.12.
+#ifdef HAVE_CLOCK_GETTIME
+    struct timespec tp = {
+        .tv_sec  = 0,
+        .tv_nsec = 0,
+    };
+    clockid_t clk_id = CLOCK_REALTIME;
+#ifdef _POSIX_MONOTONIC_CLOCK
+    clk_id = CLOCK_MONOTONIC;
+#endif
+    if (clock_gettime(clk_id, &tp) != 0) {
+        fprintf(stderr, "clock_gettime(): %s\n", strerror(errno));
+        return -1;
+    }
+    return tp.tv_sec + ((float)tp.tv_nsec / 1e9);
+#else
+    time_t t = time(NULL);
+    if (t == (time_t)-1) {
+        fprintf(stderr, "time(): %s\n", strerror(errno));
+        return -1;
+    }
+    return (long double)t;
+#endif
+}
+
+NO_PROTO static void *thread(void *arg)
+{
+    const struct thread_info *const tinfo = arg;
+    if (!tinfo) {
+        fprintf(stderr, "thread(): %s\n", strerror(EINVAL));
+        return NULL;
+    }
+
+    char ip_address[16] = { 0 };
+
+    for (int i = 0; i < tinfo->iterations; i++) {
+        memset(ip_address, 0, 16);
+        random_ipv4(ip_address);
+
+        MMDB_lookup_result_s result = lookup_or_die(tinfo->mmdb, ip_address);
+        if (!result.found_entry) {
+            continue;
+        }
+
+        MMDB_entry_data_list_s *entry_data_list = NULL;
+        int const status = MMDB_get_entry_data_list(&result.entry,
+                                                    &entry_data_list);
+        if (status != MMDB_SUCCESS) {
+            fprintf(stderr, "MMDB_get_entry_data_list(): %s\n",
+                    MMDB_strerror(status));
+            MMDB_free_entry_data_list(entry_data_list);
+            return NULL;
+        }
+
+        if (!entry_data_list) {
+            fprintf(stderr, "entry_data_list is NULL\n");
+            return NULL;
+        }
+
+        MMDB_free_entry_data_list(entry_data_list);
+    }
+
+    return NULL;
+}
+#endif

data/ext/geoip2/libmaxminddb/configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([libmaxminddb], [1.2.1], [support@maxmind.com])
+AC_INIT([libmaxminddb], [1.3.2], [support@maxmind.com])
 AC_CONFIG_SRCDIR([include/maxminddb.h])
 AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])
 
@@ -63,9 +63,11 @@ AC_CHECK_HEADERS([arpa/inet.h assert.h fcntl.h inttypes.h libgen.h math.h netdb.
 # so we only run them on non MinGW-Systems. For MinGW we also need to link
 # against ws2_32.
 AC_CANONICAL_HOST
+is_windows=false
 case $host_os in
         mingw*)
                 LDFLAGS="-lws2_32"
+                is_windows=true
         ;;
         *)
                 AC_TYPE_OFF_T
@@ -77,6 +79,7 @@ case $host_os in
         ;;
 esac
 
+AM_CONDITIONAL([WINDOWS], [test x$is_windows = xtrue])
 
 # This check is backwards in order to make life easier for people writing
 # extensions in other languages that link to this library. If they want to
@@ -94,15 +97,12 @@ AC_CHECK_TYPE(
 
 AC_CHECK_TYPES([boolean])
 
-AC_CHECK_FUNC(
-        [open_memstream],
-        [AC_DEFINE([HAVE_OPEN_MEMSTREAM], [1], [Has an open_memstream() function])])
+AC_CHECK_FUNCS([clock_gettime open_memstream])
 
 AC_C_BIGENDIAN(
         [AC_DEFINE([MMDB_LITTLE_ENDIAN], [0], [System is big-endian])],
         [AC_DEFINE([MMDB_LITTLE_ENDIAN], [1], [System is little-endian])])
 
-AC_FUNC_MALLOC
 AC_FUNC_MMAP
 
 AC_SEARCH_LIBS([fabs], [m])

data/ext/geoip2/libmaxminddb/dev-bin/ppa-release.sh

@@ -4,7 +4,7 @@ set -e
 set -x
 set -u
 
-DISTS=( wily trusty precise )
+DISTS=( artful zesty xenial trusty precise )
 
 VERSION=$(perl -MFile::Slurp::Tiny=read_file -MDateTime <<EOF
 use v5.16;
@@ -27,11 +27,11 @@ pushd "$SRCDIR"
 git merge "$VERSION"
 
 for dist in "${DISTS[@]}"; do
-    git clean -xfd
-    git reset HEAD --hard
-
     dch -v "$VERSION-0+maxmind1~$dist" -D "$dist" -u low "New upstream release."
     gbp buildpackage -S --git-ignore-new
+
+    git clean -xfd
+    git reset HEAD --hard
 done
 
 read -e -p "Release to PPA? (y/n)" SHOULD_RELEASE
@@ -41,9 +41,12 @@ if [ "$SHOULD_RELEASE" != "y" ]; then
     exit 1
 fi
 
+# Upload to launchpad
 dput ppa:maxmind/ppa ../*source.changes
 
-popd
+# Make the changelog up to date in git
+
+dch -v "$VERSION-0+maxmind1" -D "${DISTS[0]}" -u low "New upstream release."
 
 git add debian/changelog
 git commit -m "Update debian/changelog for $VERSION"

data/ext/geoip2/libmaxminddb/dev-bin/release.sh

@@ -47,6 +47,13 @@ if [ -n "$(git status --porcelain)" ]; then
     git commit -m "Bumped version to $version"
 fi
 
+./bootstrap
+./configure
+make
+make check
+make clean
+make safedist
+
 if [ ! -d .gh-pages ]; then
     echo "Checking out gh-pages in .gh-pages"
     git clone -b gh-pages git@github.com:maxmind/libmaxminddb.git .gh-pages

data/ext/geoip2/libmaxminddb/dev-bin/valgrind-all.pl

@@ -1,5 +1,10 @@
 #!/usr/bin/env perl
 
+# Note to run this you will probably want to build with ./configure
+# --disable-shared. You don't want to valgrind the libtool script.
+#
+# Also make sure you compile the tests first (`make check').
+
 use strict;
 use warnings;
 
@@ -11,11 +16,13 @@ my $top_dir = "$Bin/..";
 
 my $output;
 
-my @tests = glob "$top_dir/t/.libs/lt-*_t";
+my @tests;
+push @tests, glob "$top_dir/t/*_t";
+push @tests, glob "$top_dir/t/*-t";
 
 my @mmdblookup = (
     "$top_dir/bin/mmdblookup",
-    '--file', "$top_dir/maxmind-db/test-data/MaxMind-DB-test-decoder.mmdb",
+    '--file', "$top_dir/t/maxmind-db/test-data/MaxMind-DB-test-decoder.mmdb",
     '--ip',
 );
 
@@ -31,7 +38,7 @@ my @cmds = (
 for my $cmd (@cmds) {
     my $output;
     run3(
-        [ qw( valgrind --leak-check=full -- ), @{$cmd} ],
+        [ qw( valgrind -v --leak-check=full --show-leak-kinds=all -- ), @{$cmd} ],
         \undef,
         \$output,
         \$output,

data/ext/geoip2/libmaxminddb/include/maxminddb.h

@@ -5,8 +5,16 @@ extern "C" {
 #ifndef MAXMINDDB_H
 #define MAXMINDDB_H
 
+/* Request POSIX.1-2008. However, we want to remain compatible with
+ * POSIX.1-2001 (since we have been historically and see no reason to drop
+ * compatibility). By requesting POSIX.1-2008, we can conditionally use
+ * features provided by that standard if the implementation provides it. We can
+ * check for what the implementation provides by checking the _POSIX_VERSION
+ * macro after including unistd.h. If a feature is in POSIX.1-2008 but not
+ * POSIX.1-2001, check that macro before using the feature (or check for the
+ * feature directly if possible). */
 #ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200112L
+#define _POSIX_C_SOURCE 200809L
 #endif
 
 #include "maxminddb_config.h"
@@ -20,7 +28,7 @@ extern "C" {
 #include <winsock2.h>
 #include <ws2tcpip.h>
 /* libmaxminddb package version from configure */
-#define PACKAGE_VERSION "1.2.1"
+#define PACKAGE_VERSION "1.3.2"
 
 typedef ADDRESS_FAMILY sa_family_t;
 
@@ -135,6 +143,7 @@ typedef struct MMDB_entry_data_s {
 typedef struct MMDB_entry_data_list_s {
     MMDB_entry_data_s entry_data;
     struct MMDB_entry_data_list_s *next;
+    void *pool;
 } MMDB_entry_data_list_s;
 
 typedef struct MMDB_description_s {

data/ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb.vcxproj

@@ -20,9 +20,11 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\maxminddb.c" />
+    <ClCompile Include="..\..\src\data-pool.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\maxminddb.h" />
+    <ClInclude Include="..\..\src\data-pool.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
@@ -138,4 +140,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

data/ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb.vcxproj.filters

@@ -14,13 +14,19 @@
     <ClCompile Include="..\..\src\maxminddb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\data-pool.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\maxminddb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\data-pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
   </ItemGroup>
-</Project>
+</Project>

data/ext/geoip2/libmaxminddb/src/Makefile.am

@@ -2,8 +2,24 @@ include $(top_srcdir)/common.mk
 
 lib_LTLIBRARIES = libmaxminddb.la
 
-libmaxminddb_la_SOURCES = maxminddb.c maxminddb-compat-util.h
-libmaxminddb_la_LDFLAGS = -version-info 0:7:0
+libmaxminddb_la_SOURCES = maxminddb.c maxminddb-compat-util.h \
+	data-pool.c data-pool.h
+libmaxminddb_la_LDFLAGS = -version-info 0:7:0 -export-symbols-regex '^MMDB_.*'
 include_HEADERS = $(top_srcdir)/include/maxminddb.h
 
 pkgconfig_DATA = libmaxminddb.pc
+
+TESTS = test-data-pool
+
+check_PROGRAMS = test-data-pool
+
+test_data_pool_SOURCES = data-pool.c data-pool.h
+test_data_pool_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/t -DTEST_DATA_POOL
+test_data_pool_LDADD = $(top_srcdir)/t/libmmdbtest.la \
+	$(top_srcdir)/t/libtap/libtap.a
+
+$(top_srcdir)/t/libmmdbtest.la:
+	$(MAKE) -C $(top_srcdir)/t libmmdbtest.la
+
+$(top_srcdir)/t/libtap/libtap.a:
+	$(MAKE) -C $(top_srcdir)/t/libtap libtap.a