xwait, xtell: Add short help options!

[xtoys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a1fb68a..b724114 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.7 1999/08/20 07:32:23 mdw Exp $
+## $Id$
 ##
 ## Makefile for X tools
 ##
@@ -25,63 +25,38 @@
 ## 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.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.
-##
-
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = mLib mgLib
-
-GTK_PROGS = xshutdown xgetline xcatch
+GTK_PROGS = \
+       xshutdown$(EXEEXT) xgetline$(EXEEXT) xcatch$(EXEEXT) xmsg$(EXEEXT)
 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)
+EXTRA_PROGRAMS = xshutdown xgetline xcatch xmsg
+man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1 xcatch.1 xmsg.1
+EXTRA_DIST = \
+       $(man_MANS) \
+       debian/rules debian/copyright debian/control debian/changelog
 
 CLEANFILES = $(GTK_PROGS)
 
-INCLUDES = -I$(srcdir)/mLib
-LDADD = mgLib/libmgLib.a mLib/libmLib.a
-
 xshutdown_SOURCES = xshutdown.c xwait.h xatom.c xatom.h
-xshutdown_LDADD = $(LDADD) @GTK_LIBS@
+xshutdown_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
 
 xcatch_SOURCES = xcatch.c
-xcatch_LDADD = $(LDADD) @GTK_LIBS@
+xcatch_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
 
 xgetline_SOURCES = xgetline.c
-xgetline_LDADD = $(LDADD) @GTK_LIBS@
+xgetline_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
 
 xwait_SOURCES = xwait.c xwait.h xatom.c xatom.h
-xwait_LDADD = $(LDADD) @X_LIBS@ -lX11
+xwait_LDADD = @X_LIBS@ -lX11
 
 xtell_SOURCES = xtell.c xwait.h xatom.c xatom.h
-xtell_LDADD = $(LDADD) @X_LIBS@ -lX11
+xtell_LDADD = @X_LIBS@ -lX11
+
+xmsg_SOURCES = xmsg.c
+xmsg_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
 
 xscsize_SOURCES = xscsize.c
-xscsize_LDADD = $(LDADD) @X_LIBS@ -lX11
+xscsize_LDADD = @X_LIBS@ -lX11
 
 ##----- That's all, folks ---------------------------------------------------