Release 1.6.0.

[xtoys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ffdd407..676c52b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,12 +13,12 @@
 ### it under the terms of the GNU General Public License as published by
 ### the Free Software Foundation; either version 2 of the License, or
 ### (at your option) any later version.
-### 
+###
 ### X tools is distributed in the hope that it will be useful,
 ### but WITHOUT ANY WARRANTY; without even the implied warranty of
 ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ### GNU General Public License for more details.
-### 
+###
 ### You should have received a copy of the GNU General Public License
 ### along with X tools; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -29,14 +29,16 @@ dist_man_MANS                =
 EXTRA_DIST              =
 CLEANFILES              =
 
-confsubst = $(srcdir)/config/confsubst
+confsubst               = $(srcdir)/config/confsubst
 EXTRA_DIST             += config/confsubst
 
-###--------------------------------------------------------------------------
-### Distribution arrangements.
+V_SUBST                         = $(V_SUBST_$(V))
+V_SUBST_                = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0               = @echo "  SUBST  $@";
+SUBST                   = $(V_SUBST)$(confsubst)
 
-dist-hook::
-       echo $(VERSION) >$(distdir)/RELEASE
+SUBSTITUTIONS           = \
+       PYTHON=$(PYTHON) VERSION=$(VERSION)
 
 ###--------------------------------------------------------------------------
 ### Simple tools in C.
@@ -44,21 +46,23 @@ dist-hook::
 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_SOURCES                 = xscsize.c
+xscsize_LDADD           = $(LDADD) $(XRANDR_LIBS)
 
-## 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.
 
@@ -69,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