diff options
| author | Havoc Pennington <hp@pobox.com> | 1999-10-18 18:58:15 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 1999-10-18 18:58:15 +0000 |
| commit | 748c5c5f0cdc7b93fa260b8aaa94502f60dce1e8 (patch) | |
| tree | 8c64513cebc036d04e3d3176c87b1dcf66ba727f | |
| parent | da95365f931d235937f241be7c4b5d74ff7d4f58 (diff) | |
| download | gdk-pixbuf-748c5c5f0cdc7b93fa260b8aaa94502f60dce1e8.tar.gz | |
Remove "macros"
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
inside gnome-libs. AM_PATH_GTK for the GIF test
* src/Makefile.am: Change flags to work without libgnomeui,
comment out testpixbuf for now
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 10 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index acc61ea62..cb13ebfa2 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,13 @@ +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 + inside gnome-libs + + * src/Makefile.am: Change flags to work without libgnomeui, + comment out testpixbuf for now + 1999-10-18 Federico Mena Quintero <federico@redhat.com> * configure.in: Use $GTK_LIBS as the extra libs when checking for diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 59df1e084..25dcf9f00 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -29,12 +29,12 @@ libexec_LTLIBRARIES = \ $(XPM_LIB) \ $(TIFF_LIB) -noinst_PROGRAMS = testpixbuf +noinst_PROGRAMS = # testpixbuf DEPS = libgdk_pixbuf.la -INCLUDES = $(GNOME_INCLUDEDIR) +INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS) AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" -LDADDS = libgdk_pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@ +LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) testpixbuf_LDADD = $(LDADDS) |