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
This commit is contained in:
Havoc Pennington 1999-10-18 18:58:15 +00:00 committed by Havoc Pennington
parent da95365f93
commit 748c5c5f0c
2 changed files with 13 additions and 3 deletions

View File

@ -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> 1999-10-18 Federico Mena Quintero <federico@redhat.com>
* configure.in: Use $GTK_LIBS as the extra libs when checking for * configure.in: Use $GTK_LIBS as the extra libs when checking for

View File

@ -29,12 +29,12 @@ libexec_LTLIBRARIES = \
$(XPM_LIB) \ $(XPM_LIB) \
$(TIFF_LIB) $(TIFF_LIB)
noinst_PROGRAMS = testpixbuf noinst_PROGRAMS = # testpixbuf
DEPS = libgdk_pixbuf.la DEPS = libgdk_pixbuf.la
INCLUDES = $(GNOME_INCLUDEDIR) INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS)
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
LDADDS = libgdk_pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@ LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS)
testpixbuf_LDADD = $(LDADDS) testpixbuf_LDADD = $(LDADDS)