xatom: Overhaul xwait/xtell into a single program with subcommands.

[xtoys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae84f4c3e467b383a234095cdbd801e6258fd006..14d29edd88c8b3602bc2d512a05a007ecdc68154 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,85 +1,69 @@
-## -*-makefile-*-
-##
-## $Id: Makefile.am,v 1.8 1999/11/11 19:50:13 mdw Exp $
-##
-## Makefile for X tools
-##
-## (c) 1998 Straylight/Edgeware
-##
+### -*-makefile-*-
+###
+### Makefile for X tools
+###
+### (c) 1998 Straylight/Edgeware
+###
 
-##----- Licensing notice ----------------------------------------------------
-##
-## This file is part of the Edgeware X tools collection.
-##
-## X tools is free software; you can redistribute it and/or modify
-## 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.
+###----- Licensing notice ---------------------------------------------------
+###
+### This file is part of the Edgeware X tools collection.
+###
+### X tools is free software; you can redistribute it and/or modify
+### 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.
 
-##----- Revision history ----------------------------------------------------
-##
-## $Log: Makefile.am,v $
-## Revision 1.8  1999/11/11 19:50:13  mdw
-## Build separately from libraries.
-##
-## Revision 1.7  1999/08/20 07:32:23  mdw
-## New source file `atom.c'.
-##
-## Revision 1.6  1999/03/25 23:37:20  mdw
-## Remove absolute dependence on GTK.
-##
-## Revision 1.5  1998/12/15 23:46:23  mdw
-## Add `xcatch', and rearrange so that the GTK-based programs are only
-## mentioned in the Makefile.
-##
-## Revision 1.4  1998/12/11 09:50:37  mdw
-## Recursively build and configure mLib and mgLib.
-##
-## Revision 1.3  1998/12/03 00:37:19  mdw
-## New file: mdwfocus.c
-##
-## Revision 1.2  1998/11/21 22:27:21  mdw
-## Change build structure a bit: put common code in a library.
-##
-## Revision 1.1  1998/11/16 23:00:49  mdw
-## Initial versions.
-##
+bin_PROGRAMS            =
+bin_SCRIPTS             =
+dist_man_MANS           =
+EXTRA_DIST              =
+CLEANFILES              =
 
-AUTOMAKE_OPTIONS = foreign
+###--------------------------------------------------------------------------
+### Distribution arrangements.
 
-GTK_PROGS = xshutdown xgetline xcatch
-bin_PROGRAMS = xwait xtell xscsize @GTK_PROGS@
-EXTRA_PROGRAMS = $(GTK_PROGS)
-man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1 xcatch.1
-EXTRA_DIST = $(man_MANS)
+dist-hook::
+       echo $(VERSION) >$(distdir)/RELEASE
 
-CLEANFILES = $(GTK_PROGS)
+###--------------------------------------------------------------------------
+### Simple tools in C.
 
-xshutdown_SOURCES = xshutdown.c xwait.h xatom.c xatom.h
-xshutdown_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
+AM_CFLAGS               = $(X_CFLAGS)
+LDADD                   = -lX11 $(X_LIBS)
 
-xcatch_SOURCES = xcatch.c
-xcatch_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
+## xscsize
+bin_PROGRAMS           += xscsize
+dist_man_MANS          += xscsize.1
+xscsize_SOURCES                 =
 
-xgetline_SOURCES = xgetline.c
-xgetline_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
+xscsize_SOURCES                += xscsize.c
 
-xwait_SOURCES = xwait.c xwait.h xatom.c xatom.h
-xwait_LDADD = @X_LIBS@ -lX11
+## xatom
+bin_PROGRAMS           += xatom
+dist_man_MANS          += xatom.1
+xatom_SOURCES           =
 
-xtell_SOURCES = xtell.c xwait.h xatom.c xatom.h
-xtell_LDADD = @X_LIBS@ -lX11
+xatom_SOURCES          += xatom.c
+xatom_SOURCES          += libxatom.h libxatom.c
 
-xscsize_SOURCES = xscsize.c
-xscsize_LDADD = @X_LIBS@ -lX11
+###--------------------------------------------------------------------------
+### Debian.
 
-##----- That's all, folks ---------------------------------------------------
+EXTRA_DIST             += debian/rules
+EXTRA_DIST             += debian/control
+EXTRA_DIST             += debian/copyright
+EXTRA_DIST             += debian/changelog
+
+EXTRA_DIST             += debian/xtoys.install
+
+###----- That's all, folks --------------------------------------------------