From e3f01f8395f06da362f20ca3fac993d45eabb69a Mon Sep 17 00:00:00 2001
From: Utz-Uwe Haus <uhaus@cray.com>
Date: Wed, 22 Apr 2020 13:25:55 +0200
Subject: [PATCH] Integrate c-timestamp library as convenience lib
git subtree from git@github.com:chansen/c-timestamp.git
---
configure.ac | 1 +
deps/Makefile.am | 2 +-
deps/c-timestamp/Makefile.am | 9 +++++++++
deps/c-timestamp/{Makefile => Makefile.upstream} | 0
4 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 deps/c-timestamp/Makefile.am
rename deps/c-timestamp/{Makefile => Makefile.upstream} (100%)
diff --git a/configure.ac b/configure.ac
index 99bfd075..bc655155 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,6 +416,7 @@ AC_CONFIG_FILES([
deps/libyaml/include/Makefile
deps/libyaml/src/Makefile
deps/libcyaml/Makefile
+ deps/c-timestamp/Makefile
])
dnl AC_SUBST does not preserve executable bit on scripts, so do
diff --git a/deps/Makefile.am b/deps/Makefile.am
index 81834131..03887850 100644
--- a/deps/Makefile.am
+++ b/deps/Makefile.am
@@ -28,7 +28,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-SUBDIRS = libyaml libcyaml mamba packcc .
+SUBDIRS = libyaml libcyaml mamba packcc c-timestamp .
# dist by default would pick up SUBDIRS and all conditional additions. But some don't have a Makefile at that time, so we need to split things up
DIST_SUBDIRS = $(SUBDIRS)
diff --git a/deps/c-timestamp/Makefile.am b/deps/c-timestamp/Makefile.am
new file mode 100644
index 00000000..db0c3fe2
--- /dev/null
+++ b/deps/c-timestamp/Makefile.am
@@ -0,0 +1,9 @@
+noinst_LTLIBRARIES = libtimestamp.la
+
+libtimestamp_la_SOURCES= \
+ timestamp_compare.c \
+ timestamp_format.c \
+ timestamp_parse.c \
+ timestamp_valid.c \
+ timestamp_tm.c \
+ timestamp.h
diff --git a/deps/c-timestamp/Makefile b/deps/c-timestamp/Makefile.upstream
similarity index 100%
rename from deps/c-timestamp/Makefile
rename to deps/c-timestamp/Makefile.upstream
--
GitLab