diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 25 | ||||
| -rw-r--r-- | app-defaults/XLoad (renamed from app-defaults/XLoad.ad) | 0 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | get_rload.c | 8 | ||||
| -rw-r--r-- | xload.c | 11 | ||||
| -rw-r--r-- | xload.h | 13 |
7 files changed, 38 insertions, 38 deletions
@@ -19,3 +19,7 @@ stamp-h1 xload xload.1 *~ +*.o +xload-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 963abbe..70e8fc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,33 +33,22 @@ xload_SOURCES = \ appman_PRE = \ xload.man -# App default files (*.ad) +# App default files +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults appdefaultdir = @appdefaultdir@ - -APPDEFAULTFILES = \ +dist_appdefault_DATA = \ app-defaults/XLoad -SUFFIXES = .ad - -.ad: - [ -d app-defaults ] || mkdir app-defaults - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) xload.bit - -CLEANFILES = $(APPDEFAULTFILES) - +EXTRA_DIST = xload.bit appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +CLEANFILES = $(appman_DATA) SED = sed @@ -80,7 +69,7 @@ MAN_SUBSTS = \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -SUFFIXES += .$(APP_MAN_SUFFIX) .man +SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ @@ -91,6 +80,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/app-defaults/XLoad.ad b/app-defaults/XLoad index 3d4c978..3d4c978 100644 --- a/app-defaults/XLoad.ad +++ b/app-defaults/XLoad diff --git a/configure.ac b/configure.ac index cc8cbfb..3efdb1b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,11 +26,17 @@ AC_INIT(xload,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +XORG_CWARNFLAGS + ### How to check load average on various OS'es: # Solaris: libkstat @@ -38,15 +44,20 @@ AC_CHECK_LIB([kstat], [kstat_open]) # Checks for pkg-config packages PKG_CHECK_MODULES(XLOAD, xaw7) - +XLOAD_CFLAGS="$CWARNFLAGS $XLOAD_CFLAGS" AC_SUBST(XLOAD_CFLAGS) AC_SUBST(XLOAD_LIBS) PKG_CHECK_MODULES(APPDEFS, xt) -appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_ARG_WITH(appdefaultdir, + AC_HELP_STRING([--with-appdefaultdir=<pathname>], + [specify directory for app-defaults files (default is autodetected)]), + [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) diff --git a/get_rload.c b/get_rload.c index 0c4cc61..43d1eb3 100644 --- a/get_rload.c +++ b/get_rload.c @@ -30,14 +30,6 @@ void GetRLoadPoint( #define _PATH_RWHODIR "/var/spool/rwho" #endif -typedef struct _XLoadResources { - Boolean show_label; - Boolean use_lights; - String remote; -} XLoadResources; - -extern XLoadResources resources ; - #define WHDRSIZE ((int)(sizeof (buf) - sizeof (buf.wd_we))) void GetRLoadPoint( @@ -52,21 +52,12 @@ from the X Consortium. #include "xload.bit" -char *ProgramName; +static char *ProgramName; static void quit(Widget w, XEvent *event, String *params, Cardinal *num_params); static void ClearLights(Display *dpy); static void SetLights(XtPointer data, XtIntervalId *timer); -/* - * Definition of the Application resources structure. - */ - -typedef struct _XLoadResources { - Boolean show_label; - Boolean use_lights; - String remote; -} XLoadResources; /* * Command line options table. Only resources are entered here...there is a @@ -5,8 +5,21 @@ #include <X11/Intrinsic.h> +/* + * Definition of the Application resources structure. + */ + +typedef struct _XLoadResources { + Boolean show_label; + Boolean use_lights; + String remote; +} XLoadResources; + + extern void InitLoadPoint(void); extern void GetLoadPoint(Widget w, XtPointer closure, XtPointer call_data); extern void GetRLoadPoint(Widget w, XtPointer closure, XtPointer call_data); +extern XLoadResources resources; + #endif |