From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 16 Oct 2001 03:57:46 +0000 (-0400)
Subject: Merge
X-Git-Tag: NTP_4_1_72~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40d8976281149f9fcfe8fbb9bcfc0c05533f53ea;p=thirdparty%2Fntp.git

Merge

bk: 3bcbb03azF2sDwOVoSJkYhnZvFGqRw
---

40d8976281149f9fcfe8fbb9bcfc0c05533f53ea
diff --cc libntp/Makefile.am
index 945cc7eaa4,56448af506..ebf33b582f
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@@ -13,11 -13,11 +13,11 @@@ libntp_a_SOURCES = a_md5encrypt.c adjti
  	tstotv.c tvtoa.c tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
  	mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c \
  	icom.c audio.c
- EXTRA_libntp_a_SOURCES = adjtimex.c log.c mktime.c random.c snprintf.c \
- 	strdup.c strerror.c
+ EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
+ #	mktime.c snprintf.c strdup.c strerror.c
  libntp_a_LIBADD = @LIBOBJS@
  libntp_a_DEPENDENCIES = @LIBOBJS@
 -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 +INCLUDES = -I$(top_srcdir)/include
  ETAGS_ARGS = Makefile.am
  
  noinst_HEADERS = lib_strbuf.h log.h