Version bump.

[xtoys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 10b4835..089cc7d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.1 1998/11/16 23:00:49 mdw Exp $
+## $Id: Makefile.am,v 1.6 1999/03/25 23:37:20 mdw Exp $
 ##
 ## Makefile for X tools
 ##
@@ -28,30 +28,57 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## 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
 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 mdwopt.c mdwopt.h
-xshutdown_LDADD = @GTK_LIBS@
+CLEANFILES = $(GTK_PROGS)
+
+INCLUDES = -I$(srcdir)/mLib
+LDADD = mgLib/libmgLib.a mLib/libmLib.a
+
+xshutdown_SOURCES = xshutdown.c xwait.h
+xshutdown_LDADD = $(LDADD) @GTK_LIBS@
+
+xcatch_SOURCES = xcatch.c
+xcatch_LDADD = $(LDADD) @GTK_LIBS@
 
-xgetline_SOURCES = xgetline.c mdwopt.c mdwopt.h
-xgetline_LDADD = @GTK_LIBS@
+xgetline_SOURCES = xgetline.c
+xgetline_LDADD = $(LDADD) @GTK_LIBS@
 
 xwait_SOURCES = xwait.c xwait.h
-xwait_LDADD = @X_LIBS@ -lX11
+xwait_LDADD = $(LDADD) @X_LIBS@ -lX11
 
 xtell_SOURCES = xtell.c xwait.h
-xtell_LDADD = @X_LIBS@ -lX11
+xtell_LDADD = $(LDADD) @X_LIBS@ -lX11
 
 xscsize_SOURCES = xscsize.c
-xscsize_LDADD = @X_LIBS@ -lX11
+xscsize_LDADD = $(LDADD) @X_LIBS@ -lX11
 
 ##----- That's all, folks ---------------------------------------------------