ChangeLog, Makefile.am, Makefile.in:

  * librsaref/Makefile.am (stamp-rsaref): nodist_HEADERS are not
  supoprted yet.  Hack around it.

bk: 38d5dc46-eCs_JQzVWL218a2B28ghw

diff --git a/ChangeLog b/ChangeLog
index 41e66ac3555accdef7e38c9e7c5df44851f7b2fb..e0b1c02de4d6d3d8b7c6ee928ce61dbbe840af2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-20  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * librsaref/Makefile.am (stamp-rsaref): nodist_HEADERS are not
+       supoprted yet.  Hack around it.
+
        * ntpd/ntp_resolver.c (findhostaddr): hstrerror isn't always available.
 
        * configure.in: Look for hstrerror.

diff --git a/librsaref/Makefile.am b/librsaref/Makefile.am
index 576d6e05c99824998ce1caebfe6229837298b663..9a2bb04682d3469c434d3a15e37843fa5af9851a 100644 (file)
--- a/librsaref/Makefile.am
+++ b/librsaref/Makefile.am
@@ -7,17 +7,6 @@ CLEANFILES = $(EXTRA_LIBRARIES)
 # NOTES:
 # don't use RSAREF's global.h - we use ours.
 
-nodist_librsaref_a_HEADERS = \
-       des.h \
-       digit.h \
-       md2.h \
-       md5.h \
-       nn.h \
-       prime.h \
-       r_random.h \
-       rsa.h \
-       rsaref.h
-
 nodist_librsaref_a_SOURCES = \
        desc.c \
        digit.c \
@@ -31,15 +20,24 @@ nodist_librsaref_a_SOURCES = \
        r_keygen.c \
        r_random.c \
        r_stdlib.c \
-       rsa.c
+       rsa.c \
+       des.h \
+       digit.h \
+       md2.h \
+       md5.h \
+       nn.h \
+       prime.h \
+       r_random.h \
+       rsa.h \
+       rsaref.h
 
-BUILT_SOURCES = $(nodist_librsaref_a_SOURCES) $(nodist_librsaref_a_HEADERS)
+BUILT_SOURCES = $(nodist_librsaref_a_SOURCES)
 INCLUDES = -I$(top_srcdir)/include
 ETAGS_ARGS = Makefile.am
 
 #EXTRA_DIST = 
 
-$(nodist_librsaref_a_SOURCES) $(nodist_librsaref_a_HEADERS): stamp-rsaref
+$(nodist_librsaref_a_SOURCES): stamp-rsaref
 
 stamp-rsaref:
        @rm -f stamp-rsaref stamp-rsarefT
@@ -47,15 +45,12 @@ stamp-rsaref:
        for i in $(nodist_librsaref_a_SOURCES); do \
            case "@MAKE_LIBRSAREF@" in \
             '') touch $$i ;; \
-            *) cmp -s $$i $(srcdir)/../rsaref2/source/$$i 2>/dev/null \
-               || cp $(srcdir)/../rsaref2/source/$$i $$i ;; \
-           esac ; \
-       done
-       for i in $(nodist_librsaref_a_HEADERS); do \
-           case "@MAKE_LIBRSAREF@" in \
-            '') touch $$i ;; \
-            *) cmp -s $(srcdir)/$$i $(top_srcdir)/rsaref2/source/$$i 2>/dev/null \
-               || cp $(top_srcdir)/rsaref2/source/$$i $(srcdir)/$$i ;; \
+            *) case "$$i" in \
+                *.h) r_dst=$(srcdir)/$$i ;; \
+                *)   r_dst=$$i ;; \
+               esac ; \
+               cmp -s $${r_dst} $(srcdir)/../rsaref2/source/$$i 2>/dev/null \
+                       || cp $(srcdir)/../rsaref2/source/$$i $${r_dst} ;; \
            esac ; \
        done
        @echo timestamp > stamp-rsarefT 2> /dev/null

diff --git a/librsaref/Makefile.in b/librsaref/Makefile.in
index 2a24d07bb586f27817670c75d8c74e644752ea27..f7853cbda7aad3e3d84c21fcce992b25e032c2ab 100644 (file)
--- a/librsaref/Makefile.in
+++ b/librsaref/Makefile.in
@@ -111,18 +111,6 @@ CLEANFILES = $(EXTRA_LIBRARIES)
 # NOTES:
 # don't use RSAREF's global.h - we use ours.
 
-nodist_librsaref_a_HEADERS = \
-       des.h \
-       digit.h \
-       md2.h \
-       md5.h \
-       nn.h \
-       prime.h \
-       r_random.h \
-       rsa.h \
-       rsaref.h
-
-
 nodist_librsaref_a_SOURCES = \
        desc.c \
        digit.c \
@@ -136,10 +124,19 @@ nodist_librsaref_a_SOURCES = \
        r_keygen.c \
        r_random.c \
        r_stdlib.c \
-       rsa.c
+       rsa.c \
+       des.h \
+       digit.h \
+       md2.h \
+       md5.h \
+       nn.h \
+       prime.h \
+       r_random.h \
+       rsa.h \
+       rsaref.h
 
 
-BUILT_SOURCES = $(nodist_librsaref_a_SOURCES) $(nodist_librsaref_a_HEADERS)
+BUILT_SOURCES = $(nodist_librsaref_a_SOURCES)
 INCLUDES = -I$(top_srcdir)/include
 ETAGS_ARGS = Makefile.am
 subdir = librsaref
@@ -179,7 +176,7 @@ OBJECTS = $(nodist_librsaref_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .c .h .o
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu librsaref/Makefile
 
@@ -368,7 +365,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 #EXTRA_DIST = 
 
-$(nodist_librsaref_a_SOURCES) $(nodist_librsaref_a_HEADERS): stamp-rsaref
+$(nodist_librsaref_a_SOURCES): stamp-rsaref
 
 stamp-rsaref:
        @rm -f stamp-rsaref stamp-rsarefT
@@ -376,15 +373,12 @@ stamp-rsaref:
        for i in $(nodist_librsaref_a_SOURCES); do \
            case "@MAKE_LIBRSAREF@" in \
             '') touch $$i ;; \
-            *) cmp -s $$i $(srcdir)/../rsaref2/source/$$i 2>/dev/null \
-               || cp $(srcdir)/../rsaref2/source/$$i $$i ;; \
-           esac ; \
-       done
-       for i in $(nodist_librsaref_a_HEADERS); do \
-           case "@MAKE_LIBRSAREF@" in \
-            '') touch $$i ;; \
-            *) cmp -s $(srcdir)/$$i $(top_srcdir)/rsaref2/source/$$i 2>/dev/null \
-               || cp $(top_srcdir)/rsaref2/source/$$i $(srcdir)/$$i ;; \
+            *) case "$$i" in \
+                *.h) r_dst=$(srcdir)/$$i ;; \
+                *)   r_dst=$$i ;; \
+               esac ; \
+               cmp -s $${r_dst} $(srcdir)/../rsaref2/source/$$i 2>/dev/null \
+                       || cp $(srcdir)/../rsaref2/source/$$i $${r_dst} ;; \
            esac ; \
        done
        @echo timestamp > stamp-rsarefT 2> /dev/null