From 16f7177c3d9ac4c3932d45e125498a1b5495dce6 Mon Sep 17 00:00:00 2001 From: William King Date: Wed, 31 Dec 2014 11:52:06 -0800 Subject: [PATCH] resolve an automake warning about subdirs on latest automake The file 'libs/sofia-sip/s2check/exit77.c' was moved in order to silence the warning and to keep the build working. There might be a build problem that results from this file move, but after serveral build tests I have not found one. The contents of the file are specifically for the make check target, so I believe it would be highly unlikely to cause problems with any production feature. FS-7122 #resolve --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am | 2 +- libs/sofia-sip/{s2check => libsofia-sip-ua/nta}/exit77.c | 0 libs/sofia-sip/s2check/Makefile.am | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename libs/sofia-sip/{s2check => libsofia-sip-ua/nta}/exit77.c (100%) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index cb4f5e11bc..3d6072b228 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Wed Jan 7 17:18:14 CST 2015 +Wed Jan 7 11:24:56 PST 2015 diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am index 07ca4a440b..9beb3bb139 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am @@ -76,7 +76,7 @@ check_nta_SOURCES = check_nta.c check_nta.h \ check_nta_LDADD = ${LDADD} @CHECK_LIBS@ else -check_nta_SOURCES = $(top_srcdir)/s2check/exit77.c +check_nta_SOURCES = exit77.c endif # ---------------------------------------------------------------------- diff --git a/libs/sofia-sip/s2check/exit77.c b/libs/sofia-sip/libsofia-sip-ua/nta/exit77.c similarity index 100% rename from libs/sofia-sip/s2check/exit77.c rename to libs/sofia-sip/libsofia-sip-ua/nta/exit77.c diff --git a/libs/sofia-sip/s2check/Makefile.am b/libs/sofia-sip/s2check/Makefile.am index 179b13e3ba..ae4d7502b2 100644 --- a/libs/sofia-sip/s2check/Makefile.am +++ b/libs/sofia-sip/s2check/Makefile.am @@ -30,7 +30,7 @@ libs2_a_SOURCES = s2check.h s2tcase.c \ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = exit77.c +EXTRA_DIST = # ---------------------------------------------------------------------- # Tests