Add AM_CONDITIONAL for inside gnome-libs

1999-11-30  Havoc Pennington  <hp@pobox.com>

* configure.in: Add AM_CONDITIONAL for inside gnome-libs

* src/Makefile.am: conditionalize GnomeCanvasPixbuf
This commit is contained in:
Havoc Pennington 1999-11-30 17:53:02 +00:00 committed by Havoc Pennington
parent 3a1f89dcf5
commit 1284c3fc42
2 changed files with 16 additions and 2 deletions

View File

@ -1,3 +1,9 @@
1999-11-30 Havoc Pennington <hp@pobox.com>
* configure.in: Add AM_CONDITIONAL for inside gnome-libs
* src/Makefile.am: conditionalize GnomeCanvasPixbuf
1999-11-29 Federico Mena Quintero <federico@redhat.com>
* src/Makefile.am: Uncomment the GnomeCanvasPixbuf sources. This

View File

@ -57,6 +57,14 @@ GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
#
# The GdkPixBuf library
#
if INSIDE_GNOME_LIBS
CANVAS_SOURCEFILES=
CANVAS_HEADERFILES=
else
CANVAS_SOURCEFILES= gnome-canvas-pixbuf.c
CANVAS_HEADERFILES= gnome-canvas-pixbuf.h
endif
libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
libgdk_pixbuf_la_SOURCES = \
@ -66,7 +74,7 @@ libgdk_pixbuf_la_SOURCES = \
gdk-pixbuf-loader.c \
gdk-pixbuf-render.c \
gdk-pixbuf-drawable.c \
gnome-canvas-pixbuf.c
$(CANVAS_SOURCEFILES)
libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0
@ -74,7 +82,7 @@ libgdk_pixbufinclude_HEADERS = \
gdk-pixbuf.h \
gdk-pixbuf-drawable.h \
gdk-pixbuf-loader.h \
gnome-canvas-pixbuf.h
$(CANVAS_HEADERFILES)
noinst_HEADERS = \
gdk-pixbuf-io.h