From: Harlan Stenn Date: Sun, 12 Sep 1999 05:45:16 +0000 (-0000) Subject: ChangeLog, configure, configure.in, Makefile.in, refclock_atom.c: X-Git-Tag: NTP_4_0_98~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbee8636dede6058fe21d3174c6e7e9c89950e6c;p=thirdparty%2Fntp.git ChangeLog, configure, configure.in, Makefile.in, refclock_atom.c: * ntpd/refclock_atom.c: Add missing declaration. * configure.in (ac_cv_make_ntptime): Just look for struct ntptimeval, not timespec or nsec (Solaris 2.7 should get ntptime and it uses msec). (ac_cv_var_oncore_ok): Reorder so it's a "normal" clock * configure.in: Solaris Kernel FLL bug fixed in 106541-07 bk: 37db3decTrEAGcosNG01YPCEkvqX-A --- diff --git a/ChangeLog b/ChangeLog index 43e8bc424..bc6d4e63d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +1999-09-12 Harlan Stenn + + * ntpd/refclock_atom.c: Add missing declaration. + +1999-09-11 Harlan Stenn + + * configure.in (ac_cv_make_ntptime): Just look for struct + ntptimeval, not timespec or nsec (Solaris 2.7 should get ntptime + and it uses msec). + (ac_cv_var_oncore_ok): Reorder so it's a "normal" clock + + * configure.in: Solaris Kernel FLL bug fixed in 106541-07 + 1999-09-02 Harlan Stenn * configure.in: 4.0.97f diff --git a/configure b/configure index 20306650d..e4c315120 100755 --- a/configure +++ b/configure @@ -23,8 +23,6 @@ ac_help="$ac_help --enable-GPSVME - TrueTime GPS receiver/VME interface" ac_help="$ac_help --enable-SHM - SHM clock attached thru shared memory" -ac_help="$ac_help - --enable-ONCORE + Motorola VP/UT Oncore GPS receiver" ac_help="$ac_help --enable-all-clocks + include all suitable non-PARSE clocks:" ac_help="$ac_help @@ -59,6 +57,8 @@ ac_help="$ac_help --enable-MX4200 s Magnavox MX4200 GPS receiver" ac_help="$ac_help --enable-NMEA + NMEA GPS receiver" +ac_help="$ac_help + --enable-ONCORE + Motorola VP/UT Oncore GPS receiver" ac_help="$ac_help --enable-PALISADE + Palisade clock" ac_help="$ac_help @@ -7787,30 +7787,8 @@ EOF fi echo "$ac_t""$ntp_ok" 1>&6 -echo $ac_n "checking for ONCORE Motorola VP/UT Oncore GPS""... $ac_c" 1>&6 -echo "configure:7792: checking for ONCORE Motorola VP/UT Oncore GPS" >&5 -# Check whether --enable-ONCORE or --disable-ONCORE was given. -if test "${enable_ONCORE+set}" = set; then - enableval="$enable_ONCORE" - ntp_ok=$enableval -else - ntp_ok=yes -fi - -case "$ac_cv_var_oncore_ok" in - no) ntp_ok=no ;; -esac -if test "$ntp_ok" = "yes"; then - ntp_refclock=yes - cat >> confdefs.h <<\EOF -#define CLOCK_ONCORE 1 -EOF - -fi -echo "$ac_t""$ntp_ok" 1>&6 - echo $ac_n "checking for default inclusion of all suitable non-PARSE clocks""... $ac_c" 1>&6 -echo "configure:7814: checking for default inclusion of all suitable non-PARSE clocks" >&5 +echo "configure:7792: checking for default inclusion of all suitable non-PARSE clocks" >&5 # Check whether --enable-all-clocks or --disable-all-clocks was given. if test "${enable_all_clocks+set}" = set; then enableval="$enable_all_clocks" @@ -7822,7 +7800,7 @@ fi echo "$ac_t""$ntp_eac" 1>&6 echo $ac_n "checking if we have support for PARSE clocks""... $ac_c" 1>&6 -echo "configure:7826: checking if we have support for PARSE clocks" >&5 +echo "configure:7804: checking if we have support for PARSE clocks" >&5 case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in *yes*) ntp_canparse=yes @@ -7834,14 +7812,14 @@ echo "$ac_t""$ntp_canparse" 1>&6 # Requires modem control echo $ac_n "checking ACTS modem service""... $ac_c" 1>&6 -echo "configure:7838: checking ACTS modem service" >&5 +echo "configure:7816: checking ACTS modem service" >&5 # Check whether --enable-ACTS or --disable-ACTS was given. if test "${enable_ACTS+set}" = set; then enableval="$enable_ACTS" ntp_ok=$enableval else cat > conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -7874,7 +7852,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arbiter 1088A/B GPS receiver""... $ac_c" 1>&6 -echo "configure:7878: checking Arbiter 1088A/B GPS receiver" >&5 +echo "configure:7856: checking Arbiter 1088A/B GPS receiver" >&5 # Check whether --enable-ARBITER or --disable-ARBITER was given. if test "${enable_ARBITER+set}" = set; then enableval="$enable_ARBITER" @@ -7893,7 +7871,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arcron MSF receiver""... $ac_c" 1>&6 -echo "configure:7897: checking Arcron MSF receiver" >&5 +echo "configure:7875: checking Arcron MSF receiver" >&5 # Check whether --enable-ARCRON_MSF or --disable-ARCRON_MSF was given. if test "${enable_ARCRON_MSF+set}" = set; then enableval="$enable_ARCRON_MSF" @@ -7912,7 +7890,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Austron 2200A/2201A GPS receiver""... $ac_c" 1>&6 -echo "configure:7916: checking Austron 2200A/2201A GPS receiver" >&5 +echo "configure:7894: checking Austron 2200A/2201A GPS receiver" >&5 # Check whether --enable-AS2201 or --disable-AS2201 was given. if test "${enable_AS2201+set}" = set; then enableval="$enable_AS2201" @@ -7931,7 +7909,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking PPS interface""... $ac_c" 1>&6 -echo "configure:7935: checking PPS interface" >&5 +echo "configure:7913: checking PPS interface" >&5 # Check whether --enable-ATOM or --disable-ATOM was given. if test "${enable_ATOM+set}" = set; then enableval="$enable_ATOM" @@ -7950,7 +7928,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking CHU modem/decoder""... $ac_c" 1>&6 -echo "configure:7954: checking CHU modem/decoder" >&5 +echo "configure:7932: checking CHU modem/decoder" >&5 # Check whether --enable-CHU or --disable-CHU was given. if test "${enable_CHU+set}" = set; then enableval="$enable_CHU" @@ -7970,7 +7948,7 @@ echo "$ac_t""$ntp_ok" 1>&6 ac_refclock_chu=$ntp_ok echo $ac_n "checking CHU audio/decoder""... $ac_c" 1>&6 -echo "configure:7974: checking CHU audio/decoder" >&5 +echo "configure:7952: checking CHU audio/decoder" >&5 # Check whether --enable-AUDIO-CHU or --disable-AUDIO-CHU was given. if test "${enable_AUDIO_CHU+set}" = set; then enableval="$enable_AUDIO_CHU" @@ -7994,7 +7972,7 @@ esac # Not under HP-UX echo $ac_n "checking Datum Programmable Time System""... $ac_c" 1>&6 -echo "configure:7998: checking Datum Programmable Time System" >&5 +echo "configure:7976: checking Datum Programmable Time System" >&5 # Check whether --enable-DATUM or --disable-DATUM was given. if test "${enable_DATUM+set}" = set; then enableval="$enable_DATUM" @@ -8020,14 +7998,14 @@ echo "$ac_t""$ntp_ok" 1>&6 # Requires modem control echo $ac_n "checking Heath GC-1000 WWV/WWVH receiver""... $ac_c" 1>&6 -echo "configure:8024: checking Heath GC-1000 WWV/WWVH receiver" >&5 +echo "configure:8002: checking Heath GC-1000 WWV/WWVH receiver" >&5 # Check whether --enable-HEATH or --disable-HEATH was given. if test "${enable_HEATH+set}" = set; then enableval="$enable_HEATH" ntp_ok=$enableval else cat > conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -8060,7 +8038,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking HP 58503A GPS receiver""... $ac_c" 1>&6 -echo "configure:8064: checking HP 58503A GPS receiver" >&5 +echo "configure:8042: checking HP 58503A GPS receiver" >&5 # Check whether --enable-HPGPS or --disable-HPGPS was given. if test "${enable_HPGPS+set}" = set; then enableval="$enable_HPGPS" @@ -8079,7 +8057,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Sun IRIG audio decoder""... $ac_c" 1>&6 -echo "configure:8083: checking Sun IRIG audio decoder" >&5 +echo "configure:8061: checking Sun IRIG audio decoder" >&5 # Check whether --enable-IRIG or --disable-IRIG was given. if test "${enable_IRIG+set}" = set; then enableval="$enable_IRIG" @@ -8107,7 +8085,7 @@ case "$ntp_ok$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in esac echo $ac_n "checking Leitch CSD 5300 Master Clock System Driver""... $ac_c" 1>&6 -echo "configure:8111: checking Leitch CSD 5300 Master Clock System Driver" >&5 +echo "configure:8089: checking Leitch CSD 5300 Master Clock System Driver" >&5 # Check whether --enable-LEITCH or --disable-LEITCH was given. if test "${enable_LEITCH+set}" = set; then enableval="$enable_LEITCH" @@ -8126,7 +8104,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking local clock reference""... $ac_c" 1>&6 -echo "configure:8130: checking local clock reference" >&5 +echo "configure:8108: checking local clock reference" >&5 # Check whether --enable-LOCAL-CLOCK or --disable-LOCAL-CLOCK was given. if test "${enable_LOCAL_CLOCK+set}" = set; then enableval="$enable_LOCAL_CLOCK" @@ -8145,7 +8123,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking EES M201 MSF receiver""... $ac_c" 1>&6 -echo "configure:8149: checking EES M201 MSF receiver" >&5 +echo "configure:8127: checking EES M201 MSF receiver" >&5 # Check whether --enable-MSFEES or --disable-MSFEES was given. if test "${enable_MSFEES+set}" = set; then enableval="$enable_MSFEES" @@ -8165,7 +8143,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not Ultrix echo $ac_n "checking Magnavox MX4200 GPS receiver""... $ac_c" 1>&6 -echo "configure:8169: checking Magnavox MX4200 GPS receiver" >&5 +echo "configure:8147: checking Magnavox MX4200 GPS receiver" >&5 # Check whether --enable-MX4200 or --disable-MX4200 was given. if test "${enable_MX4200+set}" = set; then enableval="$enable_MX4200" @@ -8192,7 +8170,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking NMEA GPS receiver""... $ac_c" 1>&6 -echo "configure:8196: checking NMEA GPS receiver" >&5 +echo "configure:8174: checking NMEA GPS receiver" >&5 # Check whether --enable-NMEA or --disable-NMEA was given. if test "${enable_NMEA+set}" = set; then enableval="$enable_NMEA" @@ -8210,6 +8188,28 @@ EOF fi echo "$ac_t""$ntp_ok" 1>&6 +echo $ac_n "checking for ONCORE Motorola VP/UT Oncore GPS""... $ac_c" 1>&6 +echo "configure:8193: checking for ONCORE Motorola VP/UT Oncore GPS" >&5 +# Check whether --enable-ONCORE or --disable-ONCORE was given. +if test "${enable_ONCORE+set}" = set; then + enableval="$enable_ONCORE" + ntp_ok=$enableval +else + ntp_ok=$ntp_eac +fi + +case "$ac_cv_var_oncore_ok" in + no) ntp_ok=no ;; +esac +if test "$ntp_ok" = "yes"; then + ntp_refclock=yes + cat >> confdefs.h <<\EOF +#define CLOCK_ONCORE 1 +EOF + +fi +echo "$ac_t""$ntp_ok" 1>&6 + echo $ac_n "checking for Palisade clock""... $ac_c" 1>&6 echo "configure:8215: checking for Palisade clock" >&5 # Check whether --enable-PALISADE or --disable-PALISADE was given. @@ -8903,7 +8903,8 @@ echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can build kernel streams modules for parse""... $ac_c" 1>&6 echo "configure:8905: checking if we can build kernel streams modules for parse" >&5 ans=no -if test "$ntp_parseutil$ac_cv_header_sys_stropts_h" = "yesyes"; then +case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in + yesyes) case "$target" in sparc-*-sunos4*) case "$ac_cv_var_kernel_pll" in @@ -8922,11 +8923,12 @@ EOF MAKE_PARSEKMODULE=parse ;; esac -fi + ;; +esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we need basic refclock support""... $ac_c" 1>&6 -echo "configure:8930: checking if we need basic refclock support" >&5 +echo "configure:8932: checking if we need basic refclock support" >&5 if test "$ntp_refclock" = "yes"; then cat >> confdefs.h <<\EOF #define REFCLOCK 1 @@ -8938,7 +8940,7 @@ echo "$ac_t""$ntp_refclock" 1>&6 echo $ac_n "checking if we want HP-UX adjtimed support""... $ac_c" 1>&6 -echo "configure:8942: checking if we want HP-UX adjtimed support" >&5 +echo "configure:8944: checking if we want HP-UX adjtimed support" >&5 case "$target" in *-*-hpux[56789]*) ans=yes @@ -8956,7 +8958,7 @@ fi echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can read kmem""... $ac_c" 1>&6 -echo "configure:8960: checking if we can read kmem" >&5 +echo "configure:8962: checking if we can read kmem" >&5 if eval "test \"\${ac_cv_var_can_kmem+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9009,7 +9011,7 @@ EOF esac echo $ac_n "checking if adjtime is accurate""... $ac_c" 1>&6 -echo "configure:9013: checking if adjtime is accurate" >&5 +echo "configure:9015: checking if adjtime is accurate" >&5 if eval "test \"\${ac_cv_var_adjtime_is_accurate+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9061,7 +9063,7 @@ EOF esac echo $ac_n "checking the name of 'tick' in the kernel""... $ac_c" 1>&6 -echo "configure:9065: checking the name of 'tick' in the kernel" >&5 +echo "configure:9067: checking the name of 'tick' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_tick+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9105,7 +9107,7 @@ EOF esac # echo $ac_n "checking for the units of 'tick'""... $ac_c" 1>&6 -echo "configure:9109: checking for the units of 'tick'" >&5 +echo "configure:9111: checking for the units of 'tick'" >&5 if eval "test \"\${ac_cv_var_tick_nano+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9129,7 +9131,7 @@ EOF esac # echo $ac_n "checking the name of 'tickadj' in the kernel""... $ac_c" 1>&6 -echo "configure:9133: checking the name of 'tickadj' in the kernel" >&5 +echo "configure:9135: checking the name of 'tickadj' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_tickadj+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9182,7 +9184,7 @@ EOF esac # echo $ac_n "checking for the units of 'tickadj'""... $ac_c" 1>&6 -echo "configure:9186: checking for the units of 'tickadj'" >&5 +echo "configure:9188: checking for the units of 'tickadj'" >&5 if eval "test \"\${ac_cv_var_tickadj_nano+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9206,7 +9208,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel""... $ac_c" 1>&6 -echo "configure:9210: checking half-heartedly for 'dosynctodr' in the kernel" >&5 +echo "configure:9212: checking half-heartedly for 'dosynctodr' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_dosynctodr+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9259,7 +9261,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'noprintf' in the kernel""... $ac_c" 1>&6 -echo "configure:9263: checking half-heartedly for 'noprintf' in the kernel" >&5 +echo "configure:9265: checking half-heartedly for 'noprintf' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_noprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9309,7 +9311,7 @@ esac echo $ac_n "checking for a default value for 'tick'""... $ac_c" 1>&6 -echo "configure:9313: checking for a default value for 'tick'" >&5 +echo "configure:9315: checking for a default value for 'tick'" >&5 if eval "test \"\${ac_cv_var_tick+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9353,7 +9355,7 @@ EOF esac echo $ac_n "checking for a default value for 'tickadj'""... $ac_c" 1>&6 -echo "configure:9357: checking for a default value for 'tickadj'" >&5 +echo "configure:9359: checking for a default value for 'tickadj'" >&5 if eval "test \"\${ac_cv_var_tickadj+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9460,7 +9462,7 @@ esac echo $ac_n "checking if we want and can make the tickadj utility""... $ac_c" 1>&6 -echo "configure:9464: checking if we want and can make the tickadj utility" >&5 +echo "configure:9466: checking if we want and can make the tickadj utility" >&5 if eval "test \"\${ac_cv_make_tickadj+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9476,7 +9478,7 @@ esac echo $ac_n "checking if we want and can make the ntptime utility""... $ac_c" 1>&6 -echo "configure:9480: checking if we want and can make the ntptime utility" >&5 +echo "configure:9482: checking if we want and can make the ntptime utility" >&5 if eval "test \"\${ac_cv_make_ntptime+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9484,8 +9486,8 @@ else *linux*) ans=no ;; - *) case "$ac_cv_struct_ntptimeval_timespec$ac_cv_struct_ntptimeval_tv_nsec$ac_cv_var_kernel_pll" in - *yes*yes) + *) case "$ac_cv_struct_ntptimeval$ac_cv_var_kernel_pll" in + yesyes) ans=yes ;; *) @@ -9505,7 +9507,7 @@ case "$ac_cv_make_ntptime" in esac echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6 -echo "configure:9509: checking if we want UDP wildcard delivery" >&5 +echo "configure:9511: checking if we want UDP wildcard delivery" >&5 if eval "test \"\${ac_cv_var_udp_wildcard_delivery+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9584,7 +9586,7 @@ case "$host" in esac echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6 -echo "configure:9588: checking if we should always slew the time" >&5 +echo "configure:9590: checking if we should always slew the time" >&5 if eval "test \"\${ac_cv_var_slew_always+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9624,7 +9626,7 @@ EOF esac echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6 -echo "configure:9628: checking if we should step and slew the time" >&5 +echo "configure:9630: checking if we should step and slew the time" >&5 if eval "test \"\${ac_cv_var_step_slew+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9667,7 +9669,7 @@ EOF esac echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6 -echo "configure:9671: checking if ntpdate should step the time" >&5 +echo "configure:9673: checking if ntpdate should step the time" >&5 if eval "test \"\${ac_cv_var_ntpdate_step+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9698,7 +9700,7 @@ EOF esac echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6 -echo "configure:9702: checking if we should sync TODR clock every hour" >&5 +echo "configure:9704: checking if we should sync TODR clock every hour" >&5 if eval "test \"\${ac_cv_var_sync_todr+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9731,7 +9733,7 @@ EOF esac echo $ac_n "checking if we should avoid kernel FLL bug""... $ac_c" 1>&6 -echo "configure:9735: checking if we should avoid kernel FLL bug" >&5 +echo "configure:9737: checking if we should avoid kernel FLL bug" >&5 if eval "test \"\${ac_cv_var_kernel_fll_bug+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9741,9 +9743,18 @@ if test "${enable_kernel_fll_bug+set}" = set; then ans=$enableval else case "$target" in - *-*-solaris2.[67]*) + *-*-solaris2.6) ans=yes ;; + *-*-solaris2.7) + case "`uname -v`" in + Generic_106541-07) + ans=no + ;; + *) ans=yes + ;; + esac + ;; *) ans=no ;; esac diff --git a/configure.in b/configure.in index 25851ec19..d769a22b5 100644 --- a/configure.in +++ b/configure.in @@ -1479,18 +1479,6 @@ if test "$ntp_ok" = "yes"; then fi AC_MSG_RESULT($ntp_ok) -AC_MSG_CHECKING(for ONCORE Motorola VP/UT Oncore GPS) -AC_ARG_ENABLE(ONCORE, [ --enable-ONCORE + Motorola VP/UT Oncore GPS receiver], - [ntp_ok=$enableval], [ntp_ok=yes]) -case "$ac_cv_var_oncore_ok" in - no) ntp_ok=no ;; -esac -if test "$ntp_ok" = "yes"; then - ntp_refclock=yes - AC_DEFINE(CLOCK_ONCORE) -fi -AC_MSG_RESULT($ntp_ok) - AC_MSG_CHECKING(for default inclusion of all suitable non-PARSE clocks) AC_ARG_ENABLE(all-clocks, [ --enable-all-clocks + include all suitable non-PARSE clocks:], [ntp_eac=$enableval], [ntp_eac=yes]) @@ -1703,6 +1691,18 @@ if test "$ntp_ok" = "yes"; then fi AC_MSG_RESULT($ntp_ok) +AC_MSG_CHECKING(for ONCORE Motorola VP/UT Oncore GPS) +AC_ARG_ENABLE(ONCORE, [ --enable-ONCORE + Motorola VP/UT Oncore GPS receiver], + [ntp_ok=$enableval], [ntp_ok=$ntp_eac]) +case "$ac_cv_var_oncore_ok" in + no) ntp_ok=no ;; +esac +if test "$ntp_ok" = "yes"; then + ntp_refclock=yes + AC_DEFINE(CLOCK_ONCORE) +fi +AC_MSG_RESULT($ntp_ok) + AC_MSG_CHECKING(for Palisade clock) AC_ARG_ENABLE(PALISADE, [ --enable-PALISADE + Palisade clock], [ntp_ok=$enableval], @@ -2125,7 +2125,8 @@ AC_MSG_RESULT($ans) AC_SUBST(MAKE_PARSEKMODULE) AC_MSG_CHECKING(if we can build kernel streams modules for parse) ans=no -if test "$ntp_parseutil$ac_cv_header_sys_stropts_h" = "yesyes"; then +case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in + yesyes) case "$target" in sparc-*-sunos4*) case "$ac_cv_var_kernel_pll" in @@ -2141,7 +2142,8 @@ if test "$ntp_parseutil$ac_cv_header_sys_stropts_h" = "yesyes"; then MAKE_PARSEKMODULE=parse ;; esac -fi + ;; +esac AC_MSG_RESULT($ans) AC_MSG_CHECKING(if we need basic refclock support) @@ -2604,8 +2606,8 @@ AC_CACHE_CHECK(if we want and can make the ntptime utility, ac_cv_make_ntptime, *linux*) ans=no ;; - *) case "$ac_cv_struct_ntptimeval_timespec$ac_cv_struct_ntptimeval_tv_nsec$ac_cv_var_kernel_pll" in - *yes*yes) + *) case "$ac_cv_struct_ntptimeval$ac_cv_var_kernel_pll" in + yesyes) ans=yes ;; *) @@ -2784,9 +2786,18 @@ AC_CACHE_CHECK(if we should avoid kernel FLL bug, ac_cv_var_kernel_fll_bug, [ans=$enableval], [changequote(<<, >>)dnl case "$target" in - *-*-solaris2.[67]*) + *-*-solaris2.6) ans=yes ;; + *-*-solaris2.7) + case "`uname -v`" in + Generic_106541-07) + ans=no + ;; + *) ans=yes + ;; + esac + ;; *) ans=no ;; esac diff --git a/libparse/Makefile.in b/libparse/Makefile.in index 63ec6ed47..0f7aa3ee7 100644 --- a/libparse/Makefile.in +++ b/libparse/Makefile.in @@ -1,16 +1,21 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gives unlimited permission to copy, distribute and modify it. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. +#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies +# +# this is sick - i want the source to be compile with +# two time with different flags resulting different +# objects - still need to find a way to communicate +# that to automake/autoconf +# +# Frank Kardel +# -SHELL = @SHELL@ + +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -31,8 +36,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -48,15 +51,14 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -94,17 +96,6 @@ TESTDCF = @TESTDCF@ U = @U@ VERSION = @VERSION@ -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies -# -# this is sick - i want the source to be compile with -# two time with different flags resulting different -# objects - still need to find a way to communicate -# that to automake/autoconf -# -# Frank Kardel -# - - AUTOMAKE_OPTIONS = ../util/ansi2knr noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@ EXTRA_LIBRARIES = libparse.a libparse_kernel.a @@ -129,7 +120,6 @@ libparse_a_SOURCES = parse.c \ info_trimble.c \ trim_info.c - libparse_kernel_a_SOURCES = kparse.c \ kparse_conf.c \ kclk_meinberg.c \ @@ -144,12 +134,10 @@ libparse_kernel_a_SOURCES = kparse.c \ kclk_wharton.c \ kclk_varitext.c - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/kernel ETAGS_ARGS = Makefile.am EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c -subdir = libparse mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -161,42 +149,36 @@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ ANSI2KNR = ../util/ansi2knr libparse_a_LIBADD = -am_libparse_a_OBJECTS = parse$U.o parse_conf$U.o clk_meinberg$U.o \ +libparse_a_OBJECTS = parse$U.o parse_conf$U.o clk_meinberg$U.o \ clk_schmid$U.o clk_rawdcf$U.o clk_trimtsip$U.o clk_dcf7000$U.o \ clk_trimtaip$U.o clk_rcc8000$U.o clk_hopf6021$U.o clk_computime$U.o \ clk_wharton$U.o clk_varitext$U.o data_mbg$U.o info_trimble$U.o \ trim_info$U.o -libparse_a_OBJECTS = $(am_libparse_a_OBJECTS) libparse_kernel_a_LIBADD = -am_libparse_kernel_a_OBJECTS = kparse$U.o kparse_conf$U.o \ +libparse_kernel_a_OBJECTS = kparse$U.o kparse_conf$U.o \ kclk_meinberg$U.o kclk_schmid$U.o kclk_rawdcf$U.o kclk_trimtsip$U.o \ kclk_dcf7000$U.o kclk_trimtaip$U.o kclk_rcc8000$U.o kclk_hopf6021$U.o \ kclk_computime$U.o kclk_wharton$U.o kclk_varitext$U.o -libparse_kernel_a_OBJECTS = $(am_libparse_kernel_a_OBJECTS) AR = ar PROGRAMS = $(noinst_PROGRAMS) -parsesolaris_SOURCES = parsesolaris.c -parsesolaris_OBJECTS = parsesolaris$U.o -parsesolaris_LDADD = $(LDADD) -parsesolaris_DEPENDENCIES = -parsesolaris_LDFLAGS = parsestreams_SOURCES = parsestreams.c parsestreams_OBJECTS = parsestreams$U.o parsestreams_LDADD = $(LDADD) -parsestreams_DEPENDENCIES = parsestreams_LDFLAGS = -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) \ -parsesolaris.c parsestreams.c +parsesolaris_SOURCES = parsesolaris.c +parsesolaris_OBJECTS = parsesolaris$U.o +parsesolaris_LDADD = $(LDADD) +parsesolaris_LDFLAGS = +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -GZIP_ENV = --best +TAR = gtar +GZIP = --best DEP_FILES = .deps/clk_computime.P .deps/clk_dcf7000.P \ .deps/clk_hopf6021.P .deps/clk_meinberg.P .deps/clk_rawdcf.P \ .deps/clk_rcc8000.P .deps/clk_schmid.P .deps/clk_trimtaip.P \ @@ -208,16 +190,17 @@ DEP_FILES = .deps/clk_computime.P .deps/clk_dcf7000.P \ .deps/kclk_wharton.P .deps/kparse.P .deps/kparse_conf.P .deps/parse.P \ .deps/parse_conf.P .deps/parsesolaris.P .deps/parsestreams.P \ .deps/trim_info.P -SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) parsesolaris.c parsestreams.c -OBJECTS = $(am_libparse_a_OBJECTS) $(am_libparse_kernel_a_OBJECTS) parsesolaris$U.o parsestreams$U.o +SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) parsestreams.c parsesolaris.c +OBJECTS = $(libparse_a_OBJECTS) $(libparse_kernel_a_OBJECTS) parsestreams$U.o parsesolaris$U.o + +default: all -all: all-redirect .SUFFIXES: .SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu libparse/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -225,156 +208,125 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) mostlyclean-noinstLIBRARIES: clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: +.c.o: + $(COMPILE) -c $< + mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + 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 + cd ../util && $(MAKE) ansi2knr mostlyclean-kr: - -rm -f *_.c + rm -f *_.c clean-kr: distclean-kr: maintainer-clean-kr: -parse$U.o: -parse_conf$U.o: -clk_meinberg$U.o: -clk_schmid$U.o: -clk_rawdcf$U.o: -clk_trimtsip$U.o: -clk_dcf7000$U.o: -clk_trimtaip$U.o: -clk_rcc8000$U.o: -clk_hopf6021$U.o: -clk_computime$U.o: -clk_wharton$U.o: -clk_varitext$U.o: -data_mbg$U.o: -info_trimble$U.o: -trim_info$U.o: libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES) - -rm -f libparse.a + rm -f libparse.a $(AR) cru libparse.a $(libparse_a_OBJECTS) $(libparse_a_LIBADD) $(RANLIB) libparse.a -kparse$U.o: -kparse_conf$U.o: -kclk_meinberg$U.o: -kclk_schmid$U.o: -kclk_rawdcf$U.o: -kclk_trimtsip$U.o: -kclk_dcf7000$U.o: -kclk_trimtaip$U.o: -kclk_rcc8000$U.o: -kclk_hopf6021$U.o: -kclk_computime$U.o: -kclk_wharton$U.o: -kclk_varitext$U.o: libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES) - -rm -f libparse_kernel.a + rm -f libparse_kernel.a $(AR) cru libparse_kernel.a $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_LIBADD) $(RANLIB) libparse_kernel.a mostlyclean-noinstPROGRAMS: clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: -parsesolaris$U.o: - -parsesolaris: $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) - @rm -f parsesolaris - $(LINK) $(parsesolaris_LDFLAGS) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS) -parsestreams$U.o: parsestreams: $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES) @rm -f parsestreams $(LINK) $(parsestreams_LDFLAGS) $(parsestreams_OBJECTS) $(parsestreams_LDADD) $(LIBS) + +parsesolaris: $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) + @rm -f parsesolaris + $(LINK) $(parsesolaris_LDFLAGS) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS) clk_computime_.c: clk_computime.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_computime.c; then echo $(srcdir)/clk_computime.c; else echo clk_computime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_computime_.c + $(ANSI2KNR) $< clk_computime_.c clk_dcf7000_.c: clk_dcf7000.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_dcf7000.c; then echo $(srcdir)/clk_dcf7000.c; else echo clk_dcf7000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_dcf7000_.c + $(ANSI2KNR) $< clk_dcf7000_.c clk_hopf6021_.c: clk_hopf6021.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_hopf6021.c; then echo $(srcdir)/clk_hopf6021.c; else echo clk_hopf6021.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_hopf6021_.c + $(ANSI2KNR) $< clk_hopf6021_.c clk_meinberg_.c: clk_meinberg.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_meinberg.c; then echo $(srcdir)/clk_meinberg.c; else echo clk_meinberg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_meinberg_.c + $(ANSI2KNR) $< clk_meinberg_.c clk_rawdcf_.c: clk_rawdcf.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rawdcf.c; then echo $(srcdir)/clk_rawdcf.c; else echo clk_rawdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_rawdcf_.c + $(ANSI2KNR) $< clk_rawdcf_.c clk_rcc8000_.c: clk_rcc8000.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rcc8000.c; then echo $(srcdir)/clk_rcc8000.c; else echo clk_rcc8000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_rcc8000_.c + $(ANSI2KNR) $< clk_rcc8000_.c clk_schmid_.c: clk_schmid.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_schmid.c; then echo $(srcdir)/clk_schmid.c; else echo clk_schmid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_schmid_.c + $(ANSI2KNR) $< clk_schmid_.c clk_trimtaip_.c: clk_trimtaip.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtaip.c; then echo $(srcdir)/clk_trimtaip.c; else echo clk_trimtaip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_trimtaip_.c + $(ANSI2KNR) $< clk_trimtaip_.c clk_trimtsip_.c: clk_trimtsip.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtsip.c; then echo $(srcdir)/clk_trimtsip.c; else echo clk_trimtsip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_trimtsip_.c + $(ANSI2KNR) $< clk_trimtsip_.c clk_varitext_.c: clk_varitext.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_varitext.c; then echo $(srcdir)/clk_varitext.c; else echo clk_varitext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_varitext_.c + $(ANSI2KNR) $< clk_varitext_.c clk_wharton_.c: clk_wharton.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_wharton.c; then echo $(srcdir)/clk_wharton.c; else echo clk_wharton.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_wharton_.c + $(ANSI2KNR) $< clk_wharton_.c data_mbg_.c: data_mbg.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/data_mbg.c; then echo $(srcdir)/data_mbg.c; else echo data_mbg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > data_mbg_.c + $(ANSI2KNR) $< data_mbg_.c info_trimble_.c: info_trimble.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/info_trimble.c; then echo $(srcdir)/info_trimble.c; else echo info_trimble.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > info_trimble_.c + $(ANSI2KNR) $< info_trimble_.c kclk_computime_.c: kclk_computime.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_computime.c; then echo $(srcdir)/kclk_computime.c; else echo kclk_computime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_computime_.c + $(ANSI2KNR) $< kclk_computime_.c kclk_dcf7000_.c: kclk_dcf7000.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_dcf7000.c; then echo $(srcdir)/kclk_dcf7000.c; else echo kclk_dcf7000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_dcf7000_.c + $(ANSI2KNR) $< kclk_dcf7000_.c kclk_hopf6021_.c: kclk_hopf6021.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_hopf6021.c; then echo $(srcdir)/kclk_hopf6021.c; else echo kclk_hopf6021.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_hopf6021_.c + $(ANSI2KNR) $< kclk_hopf6021_.c kclk_meinberg_.c: kclk_meinberg.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_meinberg.c; then echo $(srcdir)/kclk_meinberg.c; else echo kclk_meinberg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_meinberg_.c + $(ANSI2KNR) $< kclk_meinberg_.c kclk_rawdcf_.c: kclk_rawdcf.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_rawdcf.c; then echo $(srcdir)/kclk_rawdcf.c; else echo kclk_rawdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_rawdcf_.c + $(ANSI2KNR) $< kclk_rawdcf_.c kclk_rcc8000_.c: kclk_rcc8000.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_rcc8000.c; then echo $(srcdir)/kclk_rcc8000.c; else echo kclk_rcc8000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_rcc8000_.c + $(ANSI2KNR) $< kclk_rcc8000_.c kclk_schmid_.c: kclk_schmid.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_schmid.c; then echo $(srcdir)/kclk_schmid.c; else echo kclk_schmid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_schmid_.c + $(ANSI2KNR) $< kclk_schmid_.c kclk_trimtaip_.c: kclk_trimtaip.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_trimtaip.c; then echo $(srcdir)/kclk_trimtaip.c; else echo kclk_trimtaip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_trimtaip_.c + $(ANSI2KNR) $< kclk_trimtaip_.c kclk_trimtsip_.c: kclk_trimtsip.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_trimtsip.c; then echo $(srcdir)/kclk_trimtsip.c; else echo kclk_trimtsip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_trimtsip_.c + $(ANSI2KNR) $< kclk_trimtsip_.c kclk_varitext_.c: kclk_varitext.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_varitext.c; then echo $(srcdir)/kclk_varitext.c; else echo kclk_varitext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_varitext_.c + $(ANSI2KNR) $< kclk_varitext_.c kclk_wharton_.c: kclk_wharton.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kclk_wharton.c; then echo $(srcdir)/kclk_wharton.c; else echo kclk_wharton.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kclk_wharton_.c + $(ANSI2KNR) $< kclk_wharton_.c kparse_.c: kparse.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kparse.c; then echo $(srcdir)/kparse.c; else echo kparse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kparse_.c + $(ANSI2KNR) $< kparse_.c kparse_conf_.c: kparse_conf.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kparse_conf.c; then echo $(srcdir)/kparse_conf.c; else echo kparse_conf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kparse_conf_.c + $(ANSI2KNR) $< kparse_conf_.c parse_.c: parse.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse.c; then echo $(srcdir)/parse.c; else echo parse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parse_.c + $(ANSI2KNR) $< parse_.c parse_conf_.c: parse_conf.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse_conf.c; then echo $(srcdir)/parse_conf.c; else echo parse_conf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parse_conf_.c + $(ANSI2KNR) $< parse_conf_.c parsesolaris_.c: parsesolaris.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsesolaris.c; then echo $(srcdir)/parsesolaris.c; else echo parsesolaris.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parsesolaris_.c + $(ANSI2KNR) $< parsesolaris_.c parsestreams_.c: parsestreams.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsestreams.c; then echo $(srcdir)/parsestreams.c; else echo parsestreams.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parsestreams_.c + $(ANSI2KNR) $< parsestreams_.c trim_info_.c: trim_info.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/trim_info.c; then echo $(srcdir)/trim_info.c; else echo trim_info.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > trim_info_.c + $(ANSI2KNR) $< trim_info_.c clk_computime_.o clk_dcf7000_.o clk_hopf6021_.o clk_meinberg_.o \ clk_rawdcf_.o clk_rcc8000_.o clk_schmid_.o clk_trimtaip_.o \ clk_trimtsip_.o clk_varitext_.o clk_wharton_.o data_mbg_.o \ @@ -386,53 +338,46 @@ parsestreams_.o trim_info_.o : $(ANSI2KNR) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - ${AWK:-awk} ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - ${AWK:-awk} ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = libparse + distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu libparse/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done +MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) +-include .deps/.P +.deps/.P: $(BUILT_SOURCES) + echo > $@ -include $(DEP_FILES) @@ -441,93 +386,76 @@ mostlyclean-depend: clean-depend: distclean-depend: - -rm -rf .deps maintainer-clean-depend: + rm -rf .deps + +.deps/%.P: %.c + @echo "Computing dependencies for $<..." + @o='o'; \ + test -n "$o" && o='$$o'; \ + $(MKDEP) $< >$@.tmp \ + && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ + && rm -f $@.tmp +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: + +all: Makefile $(LIBRARIES) $(PROGRAMS) -%.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $< - @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ - tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*D)/$(*F).P; \ - rm .deps/$(*D)/$(*F).pp - -%.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ - tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*D)/$(*F).P; \ - rm -f .deps/$(*D)/$(*F).pp -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) -all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: mostlyclean-generic: + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + rm -f Makefile $(DISTCLEANFILES) + rm -f config.cache config.log stamp-h stamp-h[0-9]* + test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ mostlyclean-kr mostlyclean-noinstPROGRAMS \ mostlyclean-tags mostlyclean-depend mostlyclean-generic -mostlyclean: mostlyclean-am - -clean-am: clean-noinstLIBRARIES clean-compile clean-kr \ +clean: clean-noinstLIBRARIES clean-compile clean-kr \ clean-noinstPROGRAMS clean-tags clean-depend \ - clean-generic mostlyclean-am + clean-generic mostlyclean -clean: clean-am - -distclean-am: distclean-noinstLIBRARIES distclean-compile distclean-kr \ +distclean: distclean-noinstLIBRARIES distclean-compile distclean-kr \ distclean-noinstPROGRAMS distclean-tags \ - distclean-depend distclean-generic clean-am - -distclean: distclean-am + distclean-depend distclean-generic clean + rm -f config.status -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ +maintainer-clean: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-kr \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ maintainer-clean-depend maintainer-clean-generic \ - distclean-am + distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +.PHONY: default mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \ @@ -535,12 +463,10 @@ maintainer-clean-kr mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS 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-depend info dvi installcheck install-exec install-data \ +install uninstall all installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean # diff --git a/librsaref/Makefile.in b/librsaref/Makefile.in index 33944cfb7..534959b3c 100644 --- a/librsaref/Makefile.in +++ b/librsaref/Makefile.in @@ -10,6 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies +#AUTOMAKE_OPTIONS = ../util/ansi2knr + + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +49,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -94,10 +97,6 @@ TESTDCF = @TESTDCF@ U = @U@ VERSION = @VERSION@ -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies -#AUTOMAKE_OPTIONS = ../util/ansi2knr - - noinst_LIBRARIES = @MAKE_LIBRSAREF@ EXTRA_LIBRARIES = librsaref.a CLEANFILES = $(EXTRA_LIBRARIES) @@ -106,34 +105,12 @@ CLEANFILES = $(EXTRA_LIBRARIES) # don't use RSAREF's global.h - we use ours. # We already have a copy of des.h -librsaref_a_SOURCES = \ - desc.c \ - digit.c \ - digit.h \ - md2.h \ - md2c.c \ - md5.h \ - md5c.c \ - nn.c \ - nn.h \ - prime.c \ - prime.h \ - r_dh.c \ - r_encode.c \ - r_enhanc.c \ - r_keygen.c \ - r_random.c \ - r_random.h \ - r_stdlib.c \ - rsa.c \ - rsa.h \ - rsaref.h +librsaref_a_SOURCES = desc.c digit.c digit.h md2.h md2c.c md5.h md5c.c nn.c nn.h prime.c prime.h r_dh.c r_encode.c r_enhanc.c r_keygen.c r_random.c r_random.h r_stdlib.c rsa.c rsa.h rsaref.h BUILT_SOURCES = $(librsaref_a_SOURCES) INCLUDES = -I$(top_srcdir)/include ETAGS_ARGS = Makefile.am -subdir = librsaref mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -144,29 +121,28 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ librsaref_a_LIBADD = -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) +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 AR = ar COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(librsaref_a_SOURCES) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/desc.P .deps/digit.P .deps/md2c.P .deps/md5c.P \ .deps/nn.P .deps/prime.P .deps/r_dh.P .deps/r_encode.P .deps/r_enhanc.P \ .deps/r_keygen.P .deps/r_random.P .deps/r_stdlib.P .deps/rsa.P SOURCES = $(librsaref_a_SOURCES) -OBJECTS = $(am_librsaref_a_OBJECTS) +OBJECTS = $(librsaref_a_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .c .o +.SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu librsaref/Makefile @@ -184,6 +160,12 @@ distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: -rm -f *.o core *.core @@ -193,19 +175,6 @@ distclean-compile: -rm -f *.tab.c maintainer-clean-compile: -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: $(librsaref_a_OBJECTS) $(librsaref_a_DEPENDENCIES) -rm -f librsaref.a @@ -217,7 +186,7 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ - ${AWK:-awk} ' { files[$$0] = 1; } \ + awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) @@ -227,7 +196,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) here=`pwd`; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ - ${AWK:-awk} ' { files[$$0] = 1; } \ + awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) @@ -243,6 +212,8 @@ maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = librsaref + distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ @@ -252,7 +223,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -275,22 +246,22 @@ maintainer-clean-depend: %.o: %.c @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $< - @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ - tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*D)/$(*F).P; \ - rm .deps/$(*D)/$(*F).pp + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp %.lo: %.c @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $< + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ - tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*D)/$(*F).P; \ - rm -f .deps/$(*D)/$(*F).pp + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -313,7 +284,7 @@ uninstall: uninstall-am all-am: Makefile $(LIBRARIES) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: @@ -361,8 +332,8 @@ 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 \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff --git a/ntpd/refclock_atom.c b/ntpd/refclock_atom.c index bf33f8a5d..196781254 100644 --- a/ntpd/refclock_atom.c +++ b/ntpd/refclock_atom.c @@ -21,6 +21,10 @@ # include #endif /* PPS */ +#ifdef HAVE_PPSAPI +#include +#endif /* HAVE_PPSAPI */ + /* * This driver furnishes an interface for pulse-per-second (PPS) signals * produced by a cesium clock, timing receiver or related equipment. It @@ -79,17 +83,26 @@ /* * Interface definitions */ +#ifdef HAVE_PPSAPI /* avoid others if api available */ +#undef PPS +#undef TTYCLK + +extern int pps_assert; +#endif /* HAVE_PPSAPI */ + #ifdef PPS /* avoid tty_clk if ppsclock available */ #undef TTYCLK #endif /* PPS */ + #ifdef TTYCLK -#define DEVICE "/dev/pps%d" /* device name and unit */ -#ifdef B38400 -#define SPEED232 B38400 /* uart speed (38400 baud) */ -#else -#define SPEED232 EXTB /* as above */ -#endif +# define DEVICE "/dev/pps%d" /* device name and unit */ +# ifdef B38400 +# define SPEED232 B38400 /* uart speed (38400 baud) */ +# else +# define SPEED232 EXTB /* as above */ +# endif #endif /* TTYCLK */ + #define PRECISION (-20) /* precision assumed (about 1 us) */ #define REFID "PPS\0" /* reference ID */ #define DESCRIPTION "PPS Clock Discipline" /* WRU */ @@ -110,6 +123,9 @@ static void atom_receive P((struct recvbuf *)); * Unit control structure */ struct atomunit { +#ifdef HAVE_PPSAPI + pps_info_t pps_info; /* pps_info control */ +#endif /* HAVE_PPSAPI */ #ifdef PPS struct ppsclockev ev; /* ppsclock control */ #endif /* PPS */ @@ -123,9 +139,9 @@ struct atomunit { static int atom_start P((int, struct peer *)); static void atom_shutdown P((int, struct peer *)); static void atom_poll P((int, struct peer *)); -#ifdef PPS +#if defined(PPS) || defined(HAVE_PPSAPI) static int atom_pps P((struct peer *)); -#endif /* PPS */ +#endif /* PPS || HAVE_PPSAPI */ /* * Transfer vector @@ -240,7 +256,7 @@ atom_shutdown( } -#ifdef PPS +#if defined(PPS) || defined(HAVE_PPSAPI) /* * atom_pps - receive data from the LDISC_PPS discipline */ @@ -251,7 +267,7 @@ atom_pps( { register struct atomunit *up; struct refclockproc *pp; - + struct timespec *tsp; l_fp lftmp; double doffset; int i; @@ -271,16 +287,36 @@ atom_pps( * if previous data are overwritten. If the discipline comes bum * or the data grow stale, just forget it. */ - i = up->ev.serial; +#ifdef HAVE_PPSAPI + i = up->pps_info.assert_sequence; + if (fdpps <= 0) + return (1); + if (time_pps_fetch(fdpps, &up->pps_info) < 0) + return (1); + if (i == up->pps_info.assert_sequence) + return (2); + if(pps_assert) + tsp = &up->pps_info.assert_timestamp; + else + tsp = &up->pps_info.clear_timestamp; + pp->lastrec.l_ui = tsp->tv_sec + JAN_1970; + TVUTOTSF(tsp->tv_nsec, pp->lastrec.l_uf); + +printf("pps %d %s\n", up->pps_info.assert_sequence, lfptoa(&pp->lastrec, 6)); + +#else + + i = up->ev.serial; if (fdpps <= 0) return (1); if (ioctl(fdpps, CIOGETEV, (caddr_t)&up->ev) < 0) return (1); if (i == up->ev.serial) return (2); - up->flags |= FLAG_PPS; pp->lastrec.l_ui = up->ev.tv.tv_sec + JAN_1970; TVUTOTSF(up->ev.tv.tv_usec, pp->lastrec.l_uf); +#endif /* HAVE_PPSAPI */ + up->flags |= FLAG_PPS; L_CLR(&lftmp); L_ADDF(&lftmp, pp->lastrec.l_f); LFPTOD(&lftmp, doffset); @@ -288,7 +324,7 @@ atom_pps( up->pollcnt = 2 * 60; return (0); } -#endif /* PPS */ +#endif /* PPS || HAVE_PPSAPI */ #ifdef TTYCLK /* @@ -397,14 +433,14 @@ atom_poll( */ pp = peer->procptr; up = (struct atomunit *)pp->unitptr; -#ifdef PPS +#if defined(PPS) || defined(HAVE_PPSAPI) if (!(up->flags & FLAG_AUX)) { if (atom_pps(peer)) return; } if (peer->burst > 0) return; -#endif /* PPS */ +#endif /* PPS || HAVE_PPSAPI */ pp->polls++; if (up->pollcnt == 0) { refclock_report(peer, CEVNT_FAULT); @@ -427,9 +463,9 @@ atom_poll( } pp->variance = 0; refclock_receive(peer); -#ifdef PPS +#if defined(PPS) || defined(HAVE_PPSAPI) peer->burst = pp->nstages; -#endif /* PPS */ +#endif /* PPS || HAVE_PPSAPI */ } #else