Progress towards Standards.info

diff --git a/.cvsignore b/.cvsignore
index 42d3dc2e2849d839c449986b2aa002212236d82f..86f3f5c64a70afb2fcbeffc8b64a4e484d2ad071 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
+Makefile
 config.log
 config.cache
 config.status

diff --git a/Makefile.in b/Makefile.in
index 09e6ff4c00b91a909559f45bd7aa01cf4fe30b67..950485521ab53a48985c29fdad7eb04bcadc3da3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,23 +16,22 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-SUBDIR=
-SUBDIRS= src dynamic client regress
+srcdir=                @srcdir@
+VPATH=         @srcdir@
 
-all:
-       set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d all; done
+SUBDIRS= src dynamic client regress
 
-check: all
-       $(MAKE) -C regress check
+all install uninstall clean distclean mostlyclean maintainer-clean distprep:
+       set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-install:
-       set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
+install-strip:
+       $(MAKE) INSTALL_PROGRAM_FLAGS=-s
 
-clean:
-       set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
+dist:                  distprep
+       false not implemented yet
 
-distclean:
-       set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d distclean; done
+check:                 all
+       $(MAKE) -C regress check
 
-maintainer-clean:
-       set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d maintainer-clean; done
+TAGS info dvi:
+       # do nothing

diff --git a/client/.cvsignore b/client/.cvsignore
index d51e7a76765a8c4111903bd95c7c4a078eac246a..777b57ab092ad5e42bea34b52278cf374d04e31f 100644 (file)
--- a/client/.cvsignore
+++ b/client/.cvsignore
@@ -1 +1,2 @@
+Makefile
 adnstest

diff --git a/client/Makefile.in b/client/Makefile.in
index 76a8bd967ba9db789c71124d787a21ca9358f724..2d3638eec75d24242235470be5c2bc47f051ea1e 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -16,13 +16,19 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-SUBDIR=/client
-DIRCFLAGS=     -I$(srcdir)/src
+srcdir=                @srcdir@
+VPATH=         @srcdir@
+
 TARGETS=       adnstest
+include                $(srcdir)/../settings.make
 
-include $(srcdir)/settings.make
+DIRCFLAGS=     -I$(srcdir)/../src
 
 install:       $(TARGETS)
-               $(INSTALL_BIN) $(TARGETS) $(bin_dir)
+               set -xe; for f in $(TARGETS); \
+                       do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+
+uninstall:
+               for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
 
-adnstest:      adnstest.o $(srcdir)/dynamic/$(SHLIBFILE)
+adnstest:      adnstest.o $(srcdir)/../dynamic/$(SHLIBFILE)

diff --git a/configure b/configure
index ef233f11bf1583a967e99fffee98e5d8f0504d48..5cc73d5044f229722d9c478efe05337ab30ec1f9 100755 (executable)
--- a/configure
+++ b/configure
@@ -689,23 +689,52 @@ else
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:696: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 
  
  echo $ac_n "checking __attribute__((,,))""... $ac_c" 1>&6
-echo "configure:696: checking __attribute__((,,))" >&5
+echo "configure:725: checking __attribute__((,,))" >&5
  if eval "test \"`echo '$''{'adns_cv_c_attribute_supported'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
   cat > conftest.$ac_ext <<EOF
-#line 702 "configure"
+#line 731 "configure"
 #include "confdefs.h"
 
 int main() {
 extern int testfunction(int x) __attribute__((,,))
 ; return 0; }
 EOF
-if { (eval echo configure:709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   adns_cv_c_attribute_supported=yes
 else
@@ -727,20 +756,20 @@ EOF
 
    
  echo $ac_n "checking __attribute__((noreturn))""... $ac_c" 1>&6
-echo "configure:731: checking __attribute__((noreturn))" >&5
+echo "configure:760: checking __attribute__((noreturn))" >&5
  if eval "test \"`echo '$''{'adns_cv_c_attribute_noreturn'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
   cat > conftest.$ac_ext <<EOF
-#line 737 "configure"
+#line 766 "configure"
 #include "confdefs.h"
 
 int main() {
 extern int testfunction(int x) __attribute__((noreturn))
 ; return 0; }
 EOF
-if { (eval echo configure:744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   adns_cv_c_attribute_noreturn=yes
 else
@@ -767,20 +796,20 @@ EOF
 
    
  echo $ac_n "checking __attribute__((const))""... $ac_c" 1>&6
-echo "configure:771: checking __attribute__((const))" >&5
+echo "configure:800: checking __attribute__((const))" >&5
  if eval "test \"`echo '$''{'adns_cv_c_attribute_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
   cat > conftest.$ac_ext <<EOF
-#line 777 "configure"
+#line 806 "configure"
 #include "confdefs.h"
 
 int main() {
 extern int testfunction(int x) __attribute__((const))
 ; return 0; }
 EOF
-if { (eval echo configure:784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   adns_cv_c_attribute_const=yes
 else
@@ -807,20 +836,20 @@ EOF
 
    
  echo $ac_n "checking __attribute__((format...))""... $ac_c" 1>&6
-echo "configure:811: checking __attribute__((format...))" >&5
+echo "configure:840: checking __attribute__((format...))" >&5
  if eval "test \"`echo '$''{'adns_cv_attribute_format'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
   cat > conftest.$ac_ext <<EOF
-#line 817 "configure"
+#line 846 "configure"
 #include "confdefs.h"
 
 int main() {
 extern int testfunction(char *y, ...) __attribute__((format(printf,1,2)))
 ; return 0; }
 EOF
-if { (eval echo configure:824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   adns_cv_attribute_format=yes
 else
@@ -974,7 +1003,9 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "settings.make src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "settings.make Makefile
+       src/Makefile client/Makefile dynamic/Makefile regress/Makefile
+ src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1005,6 +1036,7 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@CC@%$CC%g
+s%@RANLIB@%$RANLIB%g
 s%@WARNS@%$WARNS%g
 s%@SHLIBCC@%$SHLIBCC%g
 s%@MKSHLIB_1@%$MKSHLIB_1%g
@@ -1053,7 +1085,9 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"settings.make"}
+CONFIG_FILES=\${CONFIG_FILES-"settings.make Makefile
+       src/Makefile client/Makefile dynamic/Makefile regress/Makefile
+"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index 4fabdad33d0fe11f44e5b9ad1df8df9717d17003..8d40cc1719d59b46f671d6226b318f3710ca7ad8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,7 @@
 AC_INIT(src/adns.h)
 AC_CONFIG_HEADER(src/config.h)
 AC_PROG_CC
+AC_PROG_RANLIB
 ADNS_C_GCCATTRIB
 
 AC_SUBST(WARNS)
@@ -43,4 +44,7 @@ MKSHLIB_3='-lc'
 SHLIBFILE='libadns.so.$(MAJOR).$(MINOR)'
 SHLIBSONAME='libadns.so.$(MAJOR)'
 
-AC_OUTPUT(settings.make)
+AC_OUTPUT(
+       settings.make Makefile
+       src/Makefile client/Makefile dynamic/Makefile regress/Makefile
+)

diff --git a/dynamic/.cvsignore b/dynamic/.cvsignore
index 31cab989241b2bc084b71da365f405311eb5448a..ed7bf538069bbee5a88f89b6aa4db11d0846f945 100644 (file)
--- a/dynamic/.cvsignore
+++ b/dynamic/.cvsignore
@@ -1 +1,2 @@
+Makefile
 libadns.so.*

diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index b591b55c5e248553b8c3f832103b5d9a99d61cf0..3393c2b8397ab0dda5c38b564f7bb26a7de6f3ec 100644 (file)
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -16,24 +16,27 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-SUBDIR=/dynamic
-TARGETS=       $(SHLIBFILE)
+srcdir=                @srcdir@
+VPATH=         @srcdir@
 
-include $(srcdir)/settings.make
-include $(srcdir)/src/adns.make
+TARGETS=       $(SHLIBFILE)
+include                $(srcdir)/../settings.make
+include                $(srcdir)/../src/adns.make
 
 ALLOBJS=       $(addsuffix _p.o, $(basename $(LIBOBJS)))
 
 install:
-               $(INSTALL_LIB) $(SHLIBFILE) $(lib_dir)
-               $(INSTALL_HDR) $(srcdir)/src/adns.h $(include_dir)
+               $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE)
+
+uninstall:
+               rm -f $(lib_dir)/$(SHLIBFILE)
 
 $(SHLIBFILE):  $(ALLOBJS)
                rm -f $@
                $(MKSHLIB_1) $@ $(MKSHLIB_2) $(ALLOBJS) $(MKSHLIB_3)
 
-%_p.o:         $(srcdir)/src/%.c $(srcdir)/src/adns.h \
-                       $(srcdir)/src/internal.h $(srcdir)/src/config.h
-               $(SHLIBCC) -I$(srcdir)/src -c -o $@ $<
+%_p.o:         $(srcdir)/../src/%.c $(srcdir)/../src/adns.h \
+                       $(srcdir)/../src/internal.h $(srcdir)/../src/config.h
+               $(SHLIBCC) -I$(srcdir)/../src -c -o $@ $<
 
 $(LIBOBJS):    

diff --git a/regress/.cvsignore b/regress/.cvsignore
index 4c446f9040c4930d2a9f208937521306c9bb1168..154e5a94c58f2a3aaf81ffa78bc12e2403596e4c 100644 (file)
--- a/regress/.cvsignore
+++ b/regress/.cvsignore
@@ -1,3 +1,4 @@
+Makefile
 harness.h
 hcommon.c
 hrecord

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 4419b1566549901b08a60a4de8dd2551cd52f847..f1bab3cd89fcadf1a93c6bae25b6fbfd7b6377bf 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -16,8 +16,14 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-SUBDIR=/regress
-DIRCFLAGS=     -I$(srcdir)/src
+srcdir=                @srcdir@
+VPATH=         @srcdir@
+
+TARGETS=       hplayback hrecord
+include                $(srcdir)/../settings.make
+include                $(srcdir)/../src/adns.make
+
+DIRCFLAGS=     -I$(srcdir)/../src
 
 HCPPFLAGS:= $(foreach F,                       \
        gettimeofday select                     \
@@ -29,25 +35,20 @@ HARNLOBJS=  $(addsuffix _d.o, $(basename $(LIBOBJS)))
 ALLOBJS=       $(HARNLOBJS) dtest.o hrecord.o hplayback.o hcommon.o
 AUTOCSRCS=     harness.h hrecord.c hplayback.c hcommon.c
 
-TARGETS=       hplayback hrecord
-
-include $(srcdir)/settings.make
-include $(srcdir)/src/adns.make
-
 .PRECIOUS:     $(AUTOCSRCS)
 
 check:         $(TARGETS)
                ./checkall
 
-hrecord:       $(srcdir)/client/adnstest.o hrecord.o hcommon.o $(HARNLOBJS)
-hplayback:     $(srcdir)/client/adnstest.o hplayback.o hcommon.o $(HARNLOBJS)
+hrecord:       $(srcdir)/../client/adnstest.o hrecord.o hcommon.o $(HARNLOBJS)
+hplayback:     $(srcdir)/../client/adnstest.o hplayback.o hcommon.o $(HARNLOBJS)
 
-%_d.o:         $(srcdir)/src/%.c
+%_d.o:         $(srcdir)/../src/%.c
                $(CC) $(HCPPFLAGS) -c -g -o $@ $<
 
-$(ALLOBJS):    $(srcdir)/src/adns.h $(srcdir)/src/internal.h harness.h
+$(ALLOBJS):    $(srcdir)/../src/adns.h $(srcdir)/../src/internal.h harness.h
 
 %::    %.m4 hmacros.i4 hsyscalls.i4
-       m4 -P $< >$@-a.new
+       $(M4) -P $< >$@-a.new
        sed -e 's/hm_comma/,/g; s/hm_squote/'\''/g; /^[  ]*$$/d' <$@-a.new >$@-b.new
        @mv -f $@-b.new $@; rm -f $@-a.new

diff --git a/settings.make.in b/settings.make.in
index 70d7a8a95b48ab0bd7b8fede43d0a1011e254092..43139727d5a79497bd302c9cbe5fd54aba7f7623 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -17,9 +17,7 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-srcdir=                @srcdir@
-VPATH=         @srcdir@$(SUBDIR)
-
+DISTVERSION=   0.1
 MAJOR=         0
 MINOR=         1
 SHLIBFILE=     @SHLIBFILE@
@@ -31,6 +29,9 @@ AUTOCFLAGS=   @CFLAGS@
 WARNS=         @WARNS@
 #WERROR=       -Werror
 
+M4=            m4
+RANLIB=                @RANLIB@
+
 SHLIBCC=       @SHLIBCC@
 
 MKSHLIB_1=     @MKSHLIB_1@
@@ -38,19 +39,25 @@ MKSHLIB_2=  @MKSHLIB_2@
 MKSHLIB_3=     @MKSHLIB_3@
 
 prefix=                @prefix@
-bin_dir=       $(prefix)/bin
-lib_dir=       $(prefix)/lib
+exec_prefix=   @exec_prefix@
+bin_dir=       $(exec_prefix)/bin
+lib_dir=       $(exec_prefix)/lib
 include_dir=   $(prefix)/include
 
-INSTALL=       install -o 0 -g 0
-INSTALL_LIB=   $(INSTALL) -m 755
-INSTALL_BIN=   $(INSTALL) -m 755
-INSTALL_HDR=   $(INSTALL) -m 644
+INSTALL=               install -o 0 -g 0
+INSTALL_PROGRAM=       $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA=          $(INSTALL) -m 644
 
-all:           $(TARGETS)
+all:                   $(TARGETS)
 
-clean:
+clean mostlyclean:
                rm -f *.o 
 
-maintainer-clean distclean:    clean
+distclean:             clean
                rm -f $(TARGETS) *~ ./#*# core *.orig *.rej
+               rm -f Makefile settings.make config.h config.cache config.log
+
+distprep:              $(AUTOCSRCS)
+
+maintainer-clean:      distclean
+               -rm -f $(AUTOCSRCS)

diff --git a/src/.cvsignore b/src/.cvsignore
index 0e56cf2f8c1eca6ee74ebd12fb998fad4d1b24ba..547646a1f6a1f1f70e0bf4b79fa22e9d7c3aca03 100644 (file)
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1 +1,2 @@
+Makefile
 config.h

diff --git a/src/Makefile.in b/src/Makefile.in
index 2a892d94893c4baff939cde2fde9eeac515833dc..2c8043da21031b94e2ba9e36adca40e0d0c5dd92 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,18 +16,28 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-SUBDIR=/src
-TARGETS=       libadns.a
+srcdir=                @srcdir@
+VPATH=         @srcdir@
 
-include ../settings.make
-include adns.make
+TARGETS=       libadns.a
+include                $(srcdir)/../settings.make
+include                adns.make
 
 install:
+               set -xe; for f in $(TARGETS); \
+                       do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
+               $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h
+
+uninstall:
+               for f in $(TARGETS); do rm -f $(lib_dir)/$$f; done
+               rm -f $(include_dir)/adns.h
 
 ALLOBJS=       $(LIBOBJS)
 
 libadns.a:     $(LIBOBJS)
                rm -f $@
-               $(AR) cqsv $@ $(LIBOBJS)
+               $(AR) cqv $@.new $(LIBOBJS)
+               $(RANLIB) $@.new
+               mv -f $@.new $@
 
 $(LIBOBJS):    adns.h internal.h config.h