ChangeLog, Makefile.am, Makefile.in, NEWS, configure, configure.in:

  * Makefile.am (SUBDIRS): librsaref
  (dist-hook): Lose CVS subdirs in the distribution tarball
  * include/Makefile.am (noinst_HEADERS): Added iosignal.h, recvbuff.h
  * Makefile.am (dist-hook): Don't call dos2unix anymore

bk: 37957a6bEeir4-SC7lrJWdU9Atl6kA

diff --git a/ChangeLog b/ChangeLog
index 6c5ef41516ad4a449ca37f1b13a1a1376a609759..5206146582ddadc4157564cc715179b5bfa19fd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+1999-07-21  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * Makefile.am (SUBDIRS): librsaref
+       (dist-hook): Lose CVS subdirs in the distribution tarball
+
+       * include/Makefile.am (noinst_HEADERS): Added iosignal.h, recvbuff.h
+
+       * Makefile.am (dist-hook): Don't call dos2unix anymore
+
 1999-07-20  Harlan Stenn  <stenn@whimsy.udel.edu>
 
-       * configure.in: 
        * acconfig.h: 
        * util/ntptime.c: FreeBSD nano patches
        From: Per Hedeland <per@erix.ericsson.se> and
@@ -207,7 +215,7 @@ Wed May 26 21:03:30 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 Tue May 25 18:00:49 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * ntpq/ntpq_ops.c (struct varlist): name cannot be const char *
-       since may be malloc'ed.
+       since it may be malloc'ed.
 
        * ntpdc/ntpdc.c (sendrequest): Declare pass as const char *, don't
        loose const in cast.

diff --git a/Makefile.am b/Makefile.am
index 566d3026c17418a7ad87ca28d1a51358077945c9..6a492a6c8ea12c48618ccb90a3c0060ea9cd4fce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = \
        include \
        libntp  \
        libparse        \
+       librsaref       \
        ntpd    \
        ntpdate \
        ntpdc   \
@@ -35,11 +36,12 @@ $(srcdir)/COPYRIGHT: html/copyright.htm
 # local-dist: dist-tarZ
 
 dist-hook:
-       for i in $(DIST_HOOK_DIRS); do \
+       -for i in $(DIST_HOOK_DIRS); do \
          mkdir $(distdir)/$$i ; \
          cp -rp $(srcdir)/$$i $(distdir) ; \
        done ; \
-       find $(distdir)/html -name '*.htm' -exec dos2unix {} {} \; ; \
+       find $(distdir) -type d -name CVS -exec rm -rf '{}' \; ; \
+       # find $(distdir)/html -name '*.htm' -exec dos2unix {} {} \; ; \
        # cp -rp $(srcdir)/include/winnt $(distdir)/include
 
 dist-export: distdir

diff --git a/Makefile.in b/Makefile.in
index b4aff43d06df2c543eb52169c3782d1604d17211..ce848a9c839dd660e7f7b7d7d6db8e4d0fbda100 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,6 +103,7 @@ SUBDIRS = \
        include \
        libntp  \
        libparse        \
+       librsaref       \
        ntpd    \
        ntpdate \
        ntpdc   \
@@ -434,11 +435,12 @@ $(srcdir)/COPYRIGHT: html/copyright.htm
 # local-dist: dist-tarZ
 
 dist-hook:
-       for i in $(DIST_HOOK_DIRS); do \
+       -for i in $(DIST_HOOK_DIRS); do \
          mkdir $(distdir)/$$i ; \
          cp -rp $(srcdir)/$$i $(distdir) ; \
        done ; \
-       find $(distdir)/html -name '*.htm' -exec dos2unix {} {} \; ; \
+       find $(distdir) -type d -name CVS -exec rm -rf '{}' \; ; \
+       # find $(distdir)/html -name '*.htm' -exec dos2unix {} {} \; ; \
        # cp -rp $(srcdir)/include/winnt $(distdir)/include
 
 dist-export: distdir

diff --git a/NEWS b/NEWS
index cbe0ac678c3b6a094bd3268f154078207dfccc42..b8fdc66f1f6fb2354da11501dd17ef73b1d9da27 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
+(4.0.94)
+* PPS updates (including ntp.config options)
 * Lose the old DES stuff in favor of the (optional) RSAREF stuff
+* html cleanup/updates
+* numerous drivers cleaned up
+* numerous portability patches and code cleanup
 (4.0.93)
 * Oncore refclock needs PPS or one of two ioctls.
 * Don't make ntptime under Linux.  It doesn't compile for too many folks.

diff --git a/configure b/configure
index 771c84a2e16e389c09064d293e88aed2de6d5fb8..f4ff1dc867b5eab54f7f152c76fe9e0e784a55c6 100755 (executable)
--- a/configure
+++ b/configure
@@ -964,7 +964,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.93a1
+VERSION=4.0.93c
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

diff --git a/configure.in b/configure.in
index 9567a96707807f3e77f63ba7160e94c8ca2ba764..249a956e37eedd98665218795309e750fe88f41a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.93a1)
+AM_INIT_AUTOMAKE(ntp, 4.0.93c)
 AC_PREREQ(2.13)
 
 ac_cv_var_oncore_ok=no

diff --git a/include/Makefile.am b/include/Makefile.am
index 4f0ccb51f9d9a95c414271b9cae88cd00eb03cad..19f72b916a371e3c8bae0cd89d838f43bb279706 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -5,7 +5,7 @@ ntif.h ntp.h ntp_calendar.h ntp_control.h ntp_datum.h ntp_filegen.h ntp_fp.h \
 ntp_if.h ntp_io.h ntp_machine.h ntp_malloc.h ntp_proto.h ntp_refclock.h \
 ntp_request.h ntp_select.h ntp_stdlib.h ntp_string.h ntp_syslog.h \
 ntp_types.h ntp_unixtime.h ntpd.h parse.h parse_conf.h \
-binio.h mbg_gps166.h ieee754io.h ascii.h trimble.h
+binio.h mbg_gps166.h ieee754io.h ascii.h trimble.h iosignal.h recvbuff.h
 
 ETAGS_ARGS = $(srcdir)/Makefile.am
 #EXTRA_DIST = TAGS

diff --git a/include/Makefile.in b/include/Makefile.in
index 89b6acdb2cd9936a5b62339ab39bea965c110fb5..be071bb497d1760ba89ef26b8467b38d19077f04 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -102,7 +102,7 @@ ntif.h ntp.h ntp_calendar.h ntp_control.h ntp_datum.h ntp_filegen.h ntp_fp.h \
 ntp_if.h ntp_io.h ntp_machine.h ntp_malloc.h ntp_proto.h ntp_refclock.h \
 ntp_request.h ntp_select.h ntp_stdlib.h ntp_string.h ntp_syslog.h \
 ntp_types.h ntp_unixtime.h ntpd.h parse.h parse_conf.h \
-binio.h mbg_gps166.h ieee754io.h ascii.h trimble.h
+binio.h mbg_gps166.h ieee754io.h ascii.h trimble.h iosignal.h recvbuff.h
 
 
 ETAGS_ARGS = $(srcdir)/Makefile.am

diff --git a/librsaref/Makefile.am b/librsaref/Makefile.am
index 098edbc6ac58ce6c8e67acf376c3d2e39924c98a..32fd45768111ed6ff05b481684d69bb26483212e 100644 (file)
--- a/librsaref/Makefile.am
+++ b/librsaref/Makefile.am
@@ -1,5 +1,5 @@
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-AUTOMAKE_OPTIONS = ../util/ansi2knr
+#AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = @MAKE_LIBRSAREF@
 EXTRA_LIBRARIES = librsaref.a
 CLEANFILES = $(EXTRA_LIBRARIES)
@@ -37,72 +37,14 @@ ETAGS_ARGS = Makefile.am
 
 #EXTRA_DIST = 
 
-$(srcdir)/des.h: $(srcdir)/../rsaref2/source/des.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/desc.c: $(srcdir)/../rsaref2/source/desc.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/digit.c: $(srcdir)/../rsaref2/source/digit.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/digit.h: $(srcdir)/../rsaref2/source/digit.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/global.h: $(srcdir)/../rsaref2/source/global.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md2.h: $(srcdir)/../rsaref2/source/md2.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md2c.c: $(srcdir)/../rsaref2/source/md2c.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md5.h: $(srcdir)/../rsaref2/source/md5.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md5c.c: $(srcdir)/../rsaref2/source/md5c.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/nn.c: $(srcdir)/../rsaref2/source/nn.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/nn.h: $(srcdir)/../rsaref2/source/nn.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/prime.c: $(srcdir)/../rsaref2/source/prime.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/prime.h: $(srcdir)/../rsaref2/source/prime.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_dh.c: $(srcdir)/../rsaref2/source/r_dh.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_encode.c: $(srcdir)/../rsaref2/source/r_encode.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_enhanc.c: $(srcdir)/../rsaref2/source/r_enhanc.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_keygen.c: $(srcdir)/../rsaref2/source/r_keygen.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_random.c: $(srcdir)/../rsaref2/source/r_random.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_random.h: $(srcdir)/../rsaref2/source/r_random.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_stdlib.c: $(srcdir)/../rsaref2/source/r_stdlib.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/rsa.c: $(srcdir)/../rsaref2/source/rsa.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/rsa.h: $(srcdir)/../rsaref2/source/rsa.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/rsaref.h: $(srcdir)/../rsaref2/source/rsaref.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
+$(librsaref_a_SOURCES): stamp-rsaref
+       for i in $(librsaref_a_SOURCES); do \
+           case "@MAKE_LIBRSAREF@" in \
+            '') touch $$i ;; \
+            *) cmp -s $(srcdir)/$$i $(srcdir)/../rsaref2/source/$$i 2>/dev/null \
+               || cp $(srcdir)/../rsaref2/source/$$i $(srcdir)/$$i ;; \
+           esac ; \
+       done
+
+stamp-rsaref:
+       touch stamp-rsaref

diff --git a/librsaref/Makefile.in b/librsaref/Makefile.in
index 2d84f1aa224954ef9350d884230939b4f64985e8..29acd41c5f26271f43afe2121fb6f013e34918be 100644 (file)
--- a/librsaref/Makefile.in
+++ b/librsaref/Makefile.in
@@ -88,14 +88,15 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
 
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+#AUTOMAKE_OPTIONS = ../util/ansi2knr
 
 
-AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = @MAKE_LIBRSAREF@
 EXTRA_LIBRARIES = librsaref.a
 CLEANFILES = $(EXTRA_LIBRARIES)
@@ -141,11 +142,9 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 librsaref_a_LIBADD = 
-am_librsaref_a_OBJECTS =  desc$U.o digit$U.o md2c$U.o md5c$U.o nn$U.o \
-prime$U.o r_dh$U.o r_encode$U.o r_enhanc$U.o r_keygen$U.o r_random$U.o \
-r_stdlib$U.o rsa$U.o
+am_librsaref_a_OBJECTS =  desc.o digit.o md2c.o md5c.o nn.o prime.o \
+r_dh.o r_encode.o r_enhanc.o r_keygen.o r_random.o r_stdlib.o rsa.o
 librsaref_a_OBJECTS =  $(am_librsaref_a_OBJECTS)
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -193,39 +192,6 @@ distclean-compile:
        -rm -f *.tab.c
 
 maintainer-clean-compile:
-../util/ansi2knr: ../util/ansi2knr.o
-       cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.o:
-       cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
-
-
-mostlyclean-kr:
-       -rm -f *_.c
-
-clean-kr:
-
-distclean-kr:
-
-maintainer-clean-kr:
-desc$U.o:
-digit$U.o:
-md2c$U.o:
-md5c$U.o:
-nn$U.o:
-prime$U.o:
-r_dh$U.o:
-r_encode$U.o:
-r_enhanc$U.o:
-r_keygen$U.o:
-r_random$U.o:
-r_stdlib$U.o:
-rsa$U.o:
-
-librsaref.a: $(librsaref_a_OBJECTS) $(librsaref_a_DEPENDENCIES)
-       -rm -f librsaref.a
-       $(AR) cru librsaref.a $(librsaref_a_OBJECTS) $(librsaref_a_LIBADD)
-       $(RANLIB) librsaref.a
 desc.o:
 digit.o:
 md2c.o:
@@ -239,34 +205,11 @@ r_keygen.o:
 r_random.o:
 r_stdlib.o:
 rsa.o:
-desc_.c: desc.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/desc.c; then echo $(srcdir)/desc.c; else echo desc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > desc_.c
-digit_.c: digit.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/digit.c; then echo $(srcdir)/digit.c; else echo digit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > digit_.c
-md2c_.c: md2c.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/md2c.c; then echo $(srcdir)/md2c.c; else echo md2c.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > md2c_.c
-md5c_.c: md5c.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/md5c.c; then echo $(srcdir)/md5c.c; else echo md5c.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > md5c_.c
-nn_.c: nn.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/nn.c; then echo $(srcdir)/nn.c; else echo nn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > nn_.c
-prime_.c: prime.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/prime.c; then echo $(srcdir)/prime.c; else echo prime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > prime_.c
-r_dh_.c: r_dh.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/r_dh.c; then echo $(srcdir)/r_dh.c; else echo r_dh.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > r_dh_.c
-r_encode_.c: r_encode.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/r_encode.c; then echo $(srcdir)/r_encode.c; else echo r_encode.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > r_encode_.c
-r_enhanc_.c: r_enhanc.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/r_enhanc.c; then echo $(srcdir)/r_enhanc.c; else echo r_enhanc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > r_enhanc_.c
-r_keygen_.c: r_keygen.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/r_keygen.c; then echo $(srcdir)/r_keygen.c; else echo r_keygen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > r_keygen_.c
-r_random_.c: r_random.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/r_random.c; then echo $(srcdir)/r_random.c; else echo r_random.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > r_random_.c
-r_stdlib_.c: r_stdlib.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/r_stdlib.c; then echo $(srcdir)/r_stdlib.c; else echo r_stdlib.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > r_stdlib_.c
-rsa_.c: rsa.c $(ANSI2KNR)
-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rsa.c; then echo $(srcdir)/rsa.c; else echo rsa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rsa_.c
-desc_.o digit_.o md2c_.o md5c_.o nn_.o prime_.o r_dh_.o r_encode_.o \
-r_enhanc_.o r_keygen_.o r_random_.o r_stdlib_.o rsa_.o : $(ANSI2KNR)
+
+librsaref.a: $(librsaref_a_OBJECTS) $(librsaref_a_DEPENDENCIES)
+       -rm -f librsaref.a
+       $(AR) cru librsaref.a $(librsaref_a_OBJECTS) $(librsaref_a_LIBADD)
+       $(RANLIB) librsaref.a
 
 tags: TAGS
 
@@ -385,26 +328,25 @@ distclean-generic:
 maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-               mostlyclean-kr mostlyclean-tags mostlyclean-depend \
-               mostlyclean-generic
+               mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-kr clean-tags \
-               clean-depend clean-generic mostlyclean-am
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+               clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile distclean-kr \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
                distclean-tags distclean-depend distclean-generic \
                clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-               maintainer-clean-compile maintainer-clean-kr \
-               maintainer-clean-tags maintainer-clean-depend \
-               maintainer-clean-generic distclean-am
+               maintainer-clean-compile maintainer-clean-tags \
+               maintainer-clean-depend maintainer-clean-generic \
+               distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
@@ -413,87 +355,29 @@ maintainer-clean: maintainer-clean-am
 .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
-maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all install-strip \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 #EXTRA_DIST = 
 
-$(srcdir)/des.h: $(srcdir)/../rsaref2/source/des.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/desc.c: $(srcdir)/../rsaref2/source/desc.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/digit.c: $(srcdir)/../rsaref2/source/digit.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/digit.h: $(srcdir)/../rsaref2/source/digit.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/global.h: $(srcdir)/../rsaref2/source/global.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md2.h: $(srcdir)/../rsaref2/source/md2.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md2c.c: $(srcdir)/../rsaref2/source/md2c.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md5.h: $(srcdir)/../rsaref2/source/md5.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/md5c.c: $(srcdir)/../rsaref2/source/md5c.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/nn.c: $(srcdir)/../rsaref2/source/nn.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/nn.h: $(srcdir)/../rsaref2/source/nn.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/prime.c: $(srcdir)/../rsaref2/source/prime.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/prime.h: $(srcdir)/../rsaref2/source/prime.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_dh.c: $(srcdir)/../rsaref2/source/r_dh.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_encode.c: $(srcdir)/../rsaref2/source/r_encode.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_enhanc.c: $(srcdir)/../rsaref2/source/r_enhanc.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_keygen.c: $(srcdir)/../rsaref2/source/r_keygen.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_random.c: $(srcdir)/../rsaref2/source/r_random.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_random.h: $(srcdir)/../rsaref2/source/r_random.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/r_stdlib.c: $(srcdir)/../rsaref2/source/r_stdlib.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/rsa.c: $(srcdir)/../rsaref2/source/rsa.c
-       cmp -s $@ $< 2>/dev/null || cp $< $@
-
-$(srcdir)/rsa.h: $(srcdir)/../rsaref2/source/rsa.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
+$(librsaref_a_SOURCES): stamp-rsaref
+       for i in $(librsaref_a_SOURCES); do \
+           case "@MAKE_LIBRSAREF@" in \
+            '') touch $$i ;; \
+            *) cmp -s $(srcdir)/$$i $(srcdir)/../rsaref2/source/$$i 2>/dev/null \
+               || cp $(srcdir)/../rsaref2/source/$$i $(srcdir)/$$i ;; \
+           esac ; \
+       done
 
-$(srcdir)/rsaref.h: $(srcdir)/../rsaref2/source/rsaref.h
-       cmp -s $@ $< 2>/dev/null || cp $< $@
+stamp-rsaref:
+       touch stamp-rsaref
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.