X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/3cb11cac276b9a4ce0a010bcc89ee27fb950ea09..d5419f6c7e0b92ca297be7fd9e053782b20ca219:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1ace8a4..ae84f4c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.3 1998/12/03 00:37:19 mdw Exp $
+## $Id: Makefile.am,v 1.8 1999/11/11 19:50:13 mdw Exp $
 ##
 ## Makefile for X tools
 ##
@@ -28,6 +28,22 @@
 ##----- 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
 ##
@@ -40,26 +56,30 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-noinst_LIBRARIES = libxtoys.a
-libxtoys_a_SOURCES = mdwopt.c mdwopt.h quis.c quis.h
+GTK_PROGS = xshutdown xgetline xcatch
 bin_PROGRAMS = xwait xtell xscsize @GTK_PROGS@
-EXTRA_PROGRAMS = xshutdown xgetline
-man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1
+EXTRA_PROGRAMS = $(GTK_PROGS)
+man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1 xcatch.1
 EXTRA_DIST = $(man_MANS)
 
-xshutdown_SOURCES = xshutdown.c xwait.h mdwfocus.c mdwfocus.h
-xshutdown_LDADD = libxtoys.a @GTK_LIBS@
+CLEANFILES = $(GTK_PROGS)
+
+xshutdown_SOURCES = xshutdown.c xwait.h xatom.c xatom.h
+xshutdown_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
+
+xcatch_SOURCES = xcatch.c
+xcatch_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
 
-xgetline_SOURCES = xgetline.c mdwfocus.c mdwfocus.h
-xgetline_LDADD = libxtoys.a @GTK_LIBS@
+xgetline_SOURCES = xgetline.c
+xgetline_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
 
-xwait_SOURCES = xwait.c xwait.h
-xwait_LDADD = libxtoys.a @X_LIBS@ -lX11
+xwait_SOURCES = xwait.c xwait.h xatom.c xatom.h
+xwait_LDADD = @X_LIBS@ -lX11
 
-xtell_SOURCES = xtell.c xwait.h
-xtell_LDADD = libxtoys.a @X_LIBS@ -lX11
+xtell_SOURCES = xtell.c xwait.h xatom.c xatom.h
+xtell_LDADD = @X_LIBS@ -lX11
 
 xscsize_SOURCES = xscsize.c
-xscsize_LDADD = libxtoys.a @X_LIBS@ -lX11
+xscsize_LDADD = @X_LIBS@ -lX11
 
 ##----- That's all, folks ---------------------------------------------------