diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ChangeLog | 19 | ||||
| -rw-r--r-- | utils/Makefile | 2 | ||||
| -rw-r--r-- | utils/fsysopts.c | 3 | ||||
| -rw-r--r-- | utils/hurdids.c | 3 | ||||
| -rw-r--r-- | utils/login.c | 4 | ||||
| -rw-r--r-- | utils/portinfo.c | 3 | ||||
| -rw-r--r-- | utils/ps.c | 4 | ||||
| -rw-r--r-- | utils/settrans.c | 3 | ||||
| -rw-r--r-- | utils/showtrans.c | 3 | ||||
| -rw-r--r-- | utils/storeinfo.c | 3 | ||||
| -rw-r--r-- | utils/sync.c | 3 | ||||
| -rw-r--r-- | utils/vminfo.c | 3 | ||||
| -rw-r--r-- | utils/vmstat.c | 3 | ||||
| -rw-r--r-- | utils/w.c | 3 |
14 files changed, 46 insertions, 13 deletions
diff --git a/utils/ChangeLog b/utils/ChangeLog index 133ea97e..f55b5f0c 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,22 @@ +Thu Sep 5 11:45:58 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile: Use $(top_srcdir)/sh-version.h to make executables + from .sh files. + + * fsysopts.c: Include <version.h>. + (argp_program_version): Define with STANDARD_HURD_VERSION. + * w.c: Likewise. + * vmstat.c: Likewise. + * vminfo.c: Likewise. + * sync.c: Likewise. + * storeinfo.c: Likewise. + * showtrans.c: Likewise. + * settrans.c: Likewise. + * ps.c: Likewise. + * portinfo.c: Likewise. + * login.c: Likewise. + * hurdids.c: Likewise. + Sun Sep 1 14:15:46 1996 Miles Bader <miles@gnu.ai.mit.edu> * sync.c (argp_program_version): New variable. diff --git a/utils/Makefile b/utils/Makefile index 4b73d8de..5079d0c6 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -47,6 +47,6 @@ ps w hurdids settrans sync showtrans fsysopts storeinfo login vmstat portinfo \ devprobe vminfo: ../libshouldbeinlibc/libshouldbeinlibc.a %: %.sh - cp $< $@ + sed -f $(top_srcdir)/sh-version.sed < $< > $@ $(filter-out $(special-targets), $(targets)): %: %.o diff --git a/utils/fsysopts.c b/utils/fsysopts.c index a4cab6b7..b6d7e971 100644 --- a/utils/fsysopts.c +++ b/utils/fsysopts.c @@ -28,10 +28,11 @@ #include <error.h> #include <argz.h> +#include <version.h> #include <hurd/fsys.h> -char *argp_program_version = "fsysopts 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (fsysopts); static struct argp_option options[] = { diff --git a/utils/hurdids.c b/utils/hurdids.c index 26c2d14a..d48d0d69 100644 --- a/utils/hurdids.c +++ b/utils/hurdids.c @@ -26,11 +26,12 @@ #include <unistd.h> #include <pwd.h> #include <grp.h> +#include <version.h> #include <error.h> #include <hurd/id.h> -char *argp_program_version = "hurdids 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (hurdids); static struct argp_option options[] = { diff --git a/utils/login.c b/utils/login.c index 4e0c7d12..53d27ed0 100644 --- a/utils/login.c +++ b/utils/login.c @@ -31,6 +31,7 @@ #include <netdb.h> #include <time.h> #include <assert.h> +#include <version.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -50,7 +51,8 @@ exec_reauth (auth_t auth, int secure, int must_reauth, mach_port_t *ports, unsigned num_ports, mach_port_t *fds, unsigned num_fds); -char *argp_program_version = "login 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (login); + /* Defaults for various login parameters. */ char *default_args[] = { diff --git a/utils/portinfo.c b/utils/portinfo.c index fc0ce214..3f9ce6b5 100644 --- a/utils/portinfo.c +++ b/utils/portinfo.c @@ -25,6 +25,7 @@ #include <string.h> #include <unistd.h> #include <stdlib.h> +#include <version.h> #include <mach.h> @@ -34,7 +35,7 @@ #include <portinfo.h> #include <portxlate.h> -char *argp_program_version = "portinfo 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (portinfo); static const struct argp_option options[] = { {0,0,0,0,0, 1}, @@ -30,9 +30,11 @@ #include <idvec.h> #include <ps.h> #include <error.h> +#include <version.h> + #include "psout.h" -char *argp_program_version = "ps 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (ps); #define OA OPTION_ARG_OPTIONAL diff --git a/utils/settrans.c b/utils/settrans.c index 93dbdefa..13632d81 100644 --- a/utils/settrans.c +++ b/utils/settrans.c @@ -29,8 +29,9 @@ #include <error.h> #include <argz.h> #include <hurd/fshelp.h> +#include <version.h> -char *argp_program_version = "settrans 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (settrans); #define DEFAULT_TIMEOUT 60 diff --git a/utils/showtrans.c b/utils/showtrans.c index 32aaaa74..1ddef038 100644 --- a/utils/showtrans.c +++ b/utils/showtrans.c @@ -25,11 +25,12 @@ #include <argp.h> #include <fcntl.h> #include <unistd.h> +#include <version.h> #include <error.h> #include <argz.h> -char *argp_program_version = "showtrans 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (showtrans); static struct argp_option options[] = { diff --git a/utils/storeinfo.c b/utils/storeinfo.c index 86e827be..0bfc1b1f 100644 --- a/utils/storeinfo.c +++ b/utils/storeinfo.c @@ -25,13 +25,14 @@ #include <argp.h> #include <unistd.h> #include <sys/fcntl.h> +#include <version.h> #include <error.h> #include <hurd/fs.h> #include <hurd/store.h> -char *argp_program_version = "storeinfo 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (storeinfo); static struct argp_option options[] = { diff --git a/utils/sync.c b/utils/sync.c index 3a10cc1b..c03ed2d2 100644 --- a/utils/sync.c +++ b/utils/sync.c @@ -20,8 +20,9 @@ #include <hurd.h> #include <argp.h> +#include <version.h> -char *argp_program_version = "sync 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (sync); int main (int argc, char *argv[]) diff --git a/utils/vminfo.c b/utils/vminfo.c index e570589a..7d56378a 100644 --- a/utils/vminfo.c +++ b/utils/vminfo.c @@ -25,13 +25,14 @@ #include <string.h> #include <unistd.h> #include <stdlib.h> +#include <version.h> #include <mach.h> #include <mach/vm_statistics.h> #include <mach/default_pager.h> #include <hurd.h> -char *argp_program_version = "vminfo 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (vminfo); static const struct argp_option options[] = { {"verbose", 'v', 0, 0, "Give more detailed information"}, diff --git a/utils/vmstat.c b/utils/vmstat.c index eb0595f7..14a88d66 100644 --- a/utils/vmstat.c +++ b/utils/vmstat.c @@ -25,13 +25,14 @@ #include <string.h> #include <unistd.h> #include <stdlib.h> +#include <version.h> #include <mach.h> #include <mach/vm_statistics.h> #include <mach/default_pager.h> #include <hurd.h> -char *argp_program_version = "vmstat 1.1 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (vmstat); static const struct argp_option options[] = { {"terse", 't', 0, 0, "Use short one-line output format", 1 }, @@ -29,6 +29,7 @@ #include <pwd.h> #include <grp.h> #include <netdb.h> +#include <version.h> #include <sys/fcntl.h> @@ -48,7 +49,7 @@ extern char *canon_host (char *host); extern char *shared_domain (char *host1, char *host2); extern char *localhost (); -char *argp_program_version = "w 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (w); #define OA OPTION_ARG_OPTIONAL |