X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/c1c9f4d2f03061ab9de1563a66f9ee7b816ce8a4..4be8cb2b59106a6c55a235f713cc4ac2ba655df8:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ff82510..676c52b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,16 +29,16 @@ dist_man_MANS		 =
 EXTRA_DIST		 =
 CLEANFILES		 =
 
-confsubst = $(srcdir)/config/confsubst
+confsubst		 = $(srcdir)/config/confsubst
 EXTRA_DIST		+= config/confsubst
 
-###--------------------------------------------------------------------------
-### Distribution arrangements.
-
-dist-hook::
-	echo $(VERSION) >$(distdir)/RELEASE
+V_SUBST			 = $(V_SUBST_$(V))
+V_SUBST_		 = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0		 = @echo "  SUBST  $@";
+SUBST			 = $(V_SUBST)$(confsubst)
 
-EXTRA_DIST		+= config/auto-version
+SUBSTITUTIONS		 = \
+	PYTHON=$(PYTHON) VERSION=$(VERSION)
 
 ###--------------------------------------------------------------------------
 ### Simple tools in C.
@@ -46,21 +46,23 @@ EXTRA_DIST		+= config/auto-version
 AM_CFLAGS		 = $(X_CFLAGS)
 LDADD			 = -lX11 $(X_LIBS)
 
-## xscsize
+## xscsize.
 bin_PROGRAMS		+= xscsize
 dist_man_MANS		+= xscsize.1
-xscsize_SOURCES		 =
+xscsize_SOURCES		 = xscsize.c
+xscsize_LDADD		 = $(LDADD) $(XRANDR_LIBS)
 
-xscsize_SOURCES		+= xscsize.c
-
-## xatom
+## xatom.
 bin_PROGRAMS		+= xatom
 dist_man_MANS		+= xatom.1
-xatom_SOURCES		 =
-
-xatom_SOURCES		+= xatom.c
+xatom_SOURCES		 = xatom.c
 xatom_SOURCES		+= libxatom.h libxatom.c
 
+## xrepaint.
+bin_PROGRAMS		+= xrepaint
+dist_man_MANS		+= xrepaint.1
+xrepaint_SOURCES	 = xrepaint.c
+
 ###--------------------------------------------------------------------------
 ### Graphical tools in Python.
 
@@ -71,54 +73,55 @@ python_PYTHON		 =
 ## Common code.
 python_PYTHON		+= xtoys.py
 
-## xmsg
+## xmsg.
 bin_SCRIPTS		+= xmsg
 CLEANFILES		+= xmsg
 EXTRA_DIST		+= xmsg.in
-
 dist_man_MANS		+= xmsg.1
 
 xmsg: xmsg.in Makefile
-	$(confsubst) $(srcdir)/xmsg.in >$@.new \
-		PYTHON=$(PYTHON) VERSION=$(VERSION)
-	chmod +x $@.new
-	mv $@.new $@
+	$(SUBST) $(srcdir)/xmsg.in >$@.new $(SUBSTITUTIONS) && \
+		chmod +x $@.new && mv $@.new $@
 
-## xcatch
+## xcatch.
 bin_SCRIPTS		+= xcatch
 CLEANFILES		+= xcatch
 EXTRA_DIST		+= xcatch.in
-
 dist_man_MANS		+= xcatch.1
 
 xcatch: xcatch.in Makefile
-	$(confsubst) $(srcdir)/xcatch.in >$@.new \
-		PYTHON=$(PYTHON) VERSION=$(VERSION)
-	chmod +x $@.new
-	mv $@.new $@
+	$(SUBST) $(srcdir)/xcatch.in >$@.new $(SUBSTITUTIONS) && \
+		chmod +x $@.new && mv $@.new $@
 
-## xgetline
+## xgetline.
 bin_SCRIPTS		+= xgetline
 CLEANFILES		+= xgetline
 EXTRA_DIST		+= xgetline.in
-
 dist_man_MANS		+= xgetline.1
 
 xgetline: xgetline.in Makefile
-	$(confsubst) $(srcdir)/xgetline.in >$@.new \
-		PYTHON=$(PYTHON) VERSION=$(VERSION)
-	chmod +x $@.new
-	mv $@.new $@
+	$(SUBST) $(srcdir)/xgetline.in >$@.new $(SUBSTITUTIONS) && \
+		chmod +x $@.new && mv $@.new $@
 
 endif
 
 ###--------------------------------------------------------------------------
+### Distribution arrangements.
+
+dist-hook::
+	echo $(VERSION) >$(distdir)/RELEASE
+
+EXTRA_DIST		+= config/auto-version
+
+
+###--------------------------------------------------------------------------
 ### Debian.
 
 EXTRA_DIST		+= debian/rules
 EXTRA_DIST		+= debian/control
 EXTRA_DIST		+= debian/copyright
 EXTRA_DIST		+= debian/changelog
+EXTRA_DIST		+= debian/compat
 
 EXTRA_DIST		+= debian/xtoys.install