From: Damir Tomic <viperus@ntp.org>
Date: Thu, 11 Jun 2015 20:26:32 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
X-Git-Tag: NTP_4_3_40~6^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0b9f284afc036f2febc9d7008603019f64bf33a;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 5579eef8B42Dpdi8QikhhiiK42sS4g
---

d0b9f284afc036f2febc9d7008603019f64bf33a
diff --cc sntp/unity/Makefile.am
index 8f12ee9b7,5dfada7c1..69e8094dc
--- a/sntp/unity/Makefile.am
+++ b/sntp/unity/Makefile.am
@@@ -5,15 -5,15 +5,19 @@@ CLEANFILES 
  
  noinst_LIBRARIES = libunity.a
  
 +libunity_a_CFLAGS =                  	\
 +	-DUNITY_INCLUDE_DOUBLE		\
 +	$(NULL)
 +
- libunity_a_SOURCES =		\
- 	../libpkgver/colcomp.c	\
- 	unity.c			\
- 	unity.h			\
- 	unity_internals.h	\
+ libunity_a_SOURCES =				\
+ 	../libpkgver/colcomp.c			\
+ 	unity.c					\
+ 	unity.h					\
+ 	unity_internals.h			\
+ 	unity_fixture.c				\
+ 	unity_fixture.h				\
+ 	unity_fixture_internals.h		\
+ 	unity_fixture_malloc_overrides.h	\
  	$(NULL)
  
  include $(top_srcdir)/depsver.mf