From 7086e475e3fc26279f004a6cff69cd4dfbd079b4 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 10 Jun 1998 23:44:55 +0000 Subject: glib/* Moved to glib module Wed Jun 10 19:36:35 1998 Owen Taylor * glib/* Moved to glib module * INSTALL Makefile.am acconfig.h autogen.sh configure.in gtk-config.in gtk.m4 gdk/Makefile.am gtk/Makefile.am configuration changes for the above: - Use AM_PATH_GLIB by default to find glib; also accept a --with-glib option for using an uninstalled glib. - Put --enable-debug information into config.h so that we rebuild when it changes. (was in glibconfig.h) --- gtk/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk') diff --git a/gtk/Makefile.am b/gtk/Makefile.am index b8f5725505..3d64c2f7b3 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -275,7 +275,7 @@ EXTRA_DIST = \ tree_minus.xbm \ circles.xbm -INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ +INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ noinst_PROGRAMS = testgtk testinput testselection testthreads simple @@ -283,14 +283,14 @@ noinst_PROGRAMS = testgtk testinput testselection testthreads simple DEPS = \ libgtk-@LT_RELEASE@.la \ - $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la \ - $(top_builddir)/glib/libglib-1.1.la + $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la + LDADDS = \ libgtk-@LT_RELEASE@.la \ $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la \ @x_ldflags@ \ @x_libs@ \ - $(top_builddir)/glib/libglib-1.1.la \ + @GLIB_LIBS@ \ -lm testgtk_DEPENDENCIES = $(DEPS) -- cgit v1.2.1