diff options
| author | Havoc Pennington <hp@pobox.com> | 1999-10-18 19:11:35 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 1999-10-18 19:11:35 +0000 |
| commit | 3b9835b5bb6b9ccfbfbb357312d41f267c1ac0bb (patch) | |
| tree | 47ab6ffc86e16d60302d27ac55556c80927a4795 | |
| parent | 556f481ce9160b54bf1506700a2b2e34382e2788 (diff) | |
| download | gdk-pixbuf-3b9835b5bb6b9ccfbfbb357312d41f267c1ac0bb.tar.gz | |
Use AM_PATH_GLIB instead of glib-config directly
1999-10-18 Havoc Pennington <hp@pobox.com>
* configure.in: Use AM_PATH_GLIB instead of glib-config directly
* src/Makefile.am: Re-enable testpixbuf with GTK_CFLAGS/GTK_LIBS
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 6 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index e720f1935..e1a37347f 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,5 +1,11 @@ 1999-10-18 Havoc Pennington <hp@pobox.com> + * configure.in: Use AM_PATH_GLIB instead of glib-config directly + + * src/Makefile.am: Re-enable testpixbuf with GTK_CFLAGS/GTK_LIBS + +1999-10-18 Havoc Pennington <hp@pobox.com> + * Makefile.am (SUBDIRS): Remove "macros" * configure.in: Don't use GNOME_INIT, handle case where we are diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 25dcf9f00..89bab3e84 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -29,14 +29,14 @@ libexec_LTLIBRARIES = \ $(XPM_LIB) \ $(TIFF_LIB) -noinst_PROGRAMS = # testpixbuf +noinst_PROGRAMS = testpixbuf DEPS = libgdk_pixbuf.la -INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS) +INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS) AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) -testpixbuf_LDADD = $(LDADDS) +testpixbuf_LDADD = $(LDADDS) $(GTK_LIBS) # # The GdkPixBuf library |