sntp/unity/Makefile.am: fix some broken paths. Harlan Stenn.

bk: 559a16a9rUH3JG1xgum9XfVN_4tp4Q

diff --git a/ChangeLog b/ChangeLog
index ae9da2617aa760c9dc2ffe58a8812c372309f0fb..61298d20b13ff6761948b285b4e1dba422e4b155 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
 * sntp/unity/Makefile.am added a missing header. Tomasz Flendrich
 * sntp/unity/unity_config.h: Distribute it.  Harlan Stenn.
 * sntp/libevent/evconfig-private.h: remove generated filefrom SCM.  H.Stenn.
+* sntp/unity/Makefile.am: fix some broken paths.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index e211ff9d786c83e7f014607b58defa89c6e03871..e21a020fb4ec0e2ea4e37f698f767ffa2ba92759 100644 (file)
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -4,7 +4,7 @@ CLEANFILES = kod-output-blank kod-output-single kod-output-multiple debug-output
 DISTCLEANFILES = kod-output-blank kod-output-single kod-output-multiple
 EXTRA_PROGRAMS =
 
-run_unity =    cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+run_unity =    cd $(srcdir) && ruby ../unity/auto/generate_test_runner.rb
 
 # Use EXTRA_PROGRAMS for test files that are under development but
 # not production-ready
@@ -104,7 +104,7 @@ AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
 AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H
-AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
+#AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
 AM_CPPFLAGS += -I$(top_srcdir)/unity
 
 AM_LDFLAGS = $(LDFLAGS_NTP)
@@ -226,10 +226,10 @@ check-libntp: ../../libntp/libntp.a
 ../../libntp/libntp.a:
        cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
-check-libunity: ../sntp/unity/libunity.a
+check-libunity: ../unity/libunity.a
        @echo stamp > $@
 
-../sntp/unity/libunity.a:
+../unity/libunity.a:
        cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
 
 include $(top_srcdir)/depsver.mf