From 765932c506f9c0017d0e530c51696bd31cfc30b9 Mon Sep 17 00:00:00 2001 From: John Jenkins Date: Wed, 20 Apr 2016 15:44:51 -0500 Subject: [PATCH] oops, left out a bunch of files --- Make.rules | 13 ++++++++++++ Makefile.am | 51 +++++++++++++++++++++++++++++++++++++++++++++ include/ssg-margo.h | 29 ++++++++++++++++++++++++++ prepare.sh | 4 ++++ 4 files changed, 97 insertions(+) create mode 100644 Make.rules create mode 100644 Makefile.am create mode 100644 include/ssg-margo.h create mode 100755 prepare.sh diff --git a/Make.rules b/Make.rules new file mode 100644 index 0000000..8fdee9f --- /dev/null +++ b/Make.rules @@ -0,0 +1,13 @@ +# +# Output dist version +# +.phony: distversion +distversion: + @echo $(VERSION) + +# +# Easy way to build unit tests without running them +# +.phony: tests +tests: $(check_PROGRAMS) + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..c5c733f --- /dev/null +++ b/Makefile.am @@ -0,0 +1,51 @@ +AUTOMAKE_OPTIONS = foreign +ACLOCAL_AMFLAGS = -I m4 + +bin_PROGRAMS = +bin_SCRIPTS = +noinst_LIBRARIES = +noinst_PROGRAMS = +lib_LIBRARIES = +noinst_HEADERS = +TESTS = +XFAIL_TESTS = +check_PROGRAMS = +EXTRA_PROGRAMS = +CLEANFILES = $(bin_SCRIPTS) +MAINTAINERCLEANFILES = +EXTRA_DIST = +BUILT_SOURCES = +include_HEADERS = include/ssg.h +EXTRA_HEADERS = include/ssg-mpi.h + +EXTRA_DIST += prepare.sh + +AM_CPPFLAGS = -I$(top_srcdir)/include + +AM_CFLAGS = + +AM_LIBS = + +if HAVE_MPI +include_HEADERS += include/ssg-mpi.h +endif + +if HAVE_MARGO +include_HEADERS += include/ssg-margo.h +endif + +noinst_HEADERS += \ + ssg-config.h \ + examples/rpc.h + +lib_LIBRARIES += src/libssg.a +src_libssg_a_SOURCES = src/ssg.c + +noinst_PROGRAMS += examples/ssg-example +examples_ssg_example_SOURCES = examples/ssg-example.c examples/rpc.c +examples_ssg_example_LDADD = src/libssg.a + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = maint/ssg.pc + +include Make.rules diff --git a/include/ssg-margo.h b/include/ssg-margo.h new file mode 100644 index 0000000..1baf689 --- /dev/null +++ b/include/ssg-margo.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016 UChicago Argonne, LLC + * + * See COPYRIGHT in top-level directory. + */ + +#pragma once + +// lookup integrated into margo + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#include "ssg.h" + +// a "margo-aware" version of hg_lookup - still looks up everyone in one go +hg_return_t ssg_lookup_margo(ssg_t s, margo_instance_id mid); + +#ifdef __cplusplus +} +#endif + +/** + * vim: ft=c sw=4 ts=4 sts=4 tw=80 expandtab + */ diff --git a/prepare.sh b/prepare.sh new file mode 100755 index 0000000..c8c64dc --- /dev/null +++ b/prepare.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "Regenerating build files..." +autoreconf -fi