Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/

into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 5579eef8B42Dpdi8QikhhiiK42sS4g

diff --cc sntp/unity/Makefile.am
index 8f12ee9b7a4cce92cf1d584cd7f9c635bcfaf3bc,5dfada7c1c3e7b7980c0dbae0ebfa3fca1be97fe..69e8094dcfb27404ca2cce46dfa678ea4c50eebb
--- 1/sntp/unity/Makefile.am
--- 2/sntp/unity/Makefile.am
+++ b/sntp/unity/Makefile.am
@@@ -5,15 -5,15 +5,19 @@@ CLEANFILES 
  
  noinst_LIBRARIES = libunity.a
  
- libunity_a_SOURCES =          \
-       ../libpkgver/colcomp.c  \
-       unity.c                 \
-       unity.h                 \
-       unity_internals.h       \
 +libunity_a_CFLAGS =                   \
 +      -DUNITY_INCLUDE_DOUBLE          \
 +      $(NULL)
 +
+ 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