Correct problems in make distcheck.

5 files changed, 26 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index 48c7541..eaaf5b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,7 @@ stamp-h1
 xmag
 xmag.1
 *~
+*.o
+xmag-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 328af14..39de39e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,26 +40,15 @@ appman_PRE = \
 
 # App default files  (*.ad)
 
-appdefaultdir = @appdefaultdir@
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
+appdefaultdir = @appdefaultdir@
 
-APPDEFAULTFILES = \
+dist_appdefault_DATA = \
         app-defaults/Xmag
 
-SUFFIXES = .ad
-
-.ad:
-	$(mkdir_p) app-defaults
-	cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
-
-CLEANFILES = $(APPDEFAULTFILES)
-
 # Developer documentation for Scale widget in Scale.c
-EXTRA_DIST += Scale.txt
+EXTRA_DIST = Scale.txt
 
 EXTRA_DIST += xmag.icon
 
@@ -68,7 +57,7 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
 EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES = $(appman_DATA)
 
 SED = sed
 
@@ -89,7 +78,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) < $< > $@
@@ -100,6 +89,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/Xmag.ad b/app-defaults/Xmag
index 1bc4961..1bc4961 100644
--- a/app-defaults/Xmag.ad
+++ b/app-defaults/Xmag
diff --git a/configure.ac b/configure.ac
index 318a2c6..1bac378 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,23 +26,35 @@ AC_INIT(xmag,[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
+
 AC_CHECK_FUNCS([nanosleep poll select])
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XMAG, xaw7)
+XMAG_CFLAGS="$CWARNFLAGS $XMAG_CFLAGS"
 AC_SUBST(XMAG_CFLAGS)
 AC_SUBST(XMAG_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/xmag.c b/xmag.c
index 974b027..cbcf399 100644
--- a/xmag.c
+++ b/xmag.c
@@ -339,8 +339,8 @@ PopupPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
     XtSetArg(wargs[n], XtNx, label_x); n++;
     XtSetArg(wargs[n], XtNy, label_y); n++;
     XtSetValues(data->pixShell, wargs, n);
-    
-    UpdatePixelAP(w, event, 0, 0);
+
+    UpdatePixelAP(w, event, NULL, NULL);
 }