Build separately from libraries.

[xtoys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a1fb68a..ae84f4c 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.am,v 1.8 1999/11/11 19:50:13 mdw Exp $
 ##
 ## Makefile for X tools
 ##
@@ -28,6 +28,9 @@
 ##----- 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'.
 ##
@@ -53,8 +56,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = mLib mgLib
-
 GTK_PROGS = xshutdown xgetline xcatch
 bin_PROGRAMS = xwait xtell xscsize @GTK_PROGS@
 EXTRA_PROGRAMS = $(GTK_PROGS)
@@ -63,25 +64,22 @@ EXTRA_DIST = $(man_MANS)
 
 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
 
 xscsize_SOURCES = xscsize.c
-xscsize_LDADD = $(LDADD) @X_LIBS@ -lX11
+xscsize_LDADD = @X_LIBS@ -lX11
 
 ##----- That's all, folks ---------------------------------------------------