diff options
| author | Owen Taylor <otaylor@gtk.org> | 1998-06-10 23:44:55 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-06-10 23:44:55 +0000 |
| commit | 7086e475e3fc26279f004a6cff69cd4dfbd079b4 (patch) | |
| tree | 0ac4f76502e335e7c96a7d6fea98c6e6a792d72a /gtk | |
| parent | 6b61461a404b910f9024299fd97fc9cb2423d781 (diff) | |
| download | gtk+-7086e475e3fc26279f004a6cff69cd4dfbd079b4.tar.gz | |
glib/* Moved to glib module
Wed Jun 10 19:36:35 1998 Owen Taylor <otaylor@gtk.org>
* 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)
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
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) |