diff options
| author | Tim Janik <timj@gtk.org> | 2001-04-04 07:20:41 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-04-04 07:20:41 +0000 |
| commit | dcb94348a727d0e3b724693c5bde9b500cd75e05 (patch) | |
| tree | da05e5423558bcd5356d2da63d88e721215ccbfd /gdk-pixbuf | |
| parent | 2423d86b3d0ccb2863e498c7aabf2cf7535edc52 (diff) | |
| download | gdk-pixbuf-dcb94348a727d0e3b724693c5bde9b500cd75e05.tar.gz | |
Released Gtk+-1.3.3.GTK_1_3_3
Wed Apr 4 09:18:18 2001 Tim Janik <timj@gtk.org>
* Released Gtk+-1.3.3.
Wed Apr 4 07:42:23 2001 Tim Janik <timj@gtk.org>
* gdk/Makefile.am (EXTRA_DIST): add makeenums.pl to EXTRA_DIST.
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 10 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 8 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-marshal.list | 1 | ||||
| -rw-r--r-- | gdk-pixbuf/pixops/Makefile.am | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index e0a0f71c2..a3ebb8f28 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,13 @@ +Wed Apr 4 01:41:02 2001 Tim Janik <timj@gtk.org> + + * pixops/Makefile.am (noinst_LTLIBRARIES): include $top_srcdir + so we don't try to get <gtk/gtkobject.h> from standard search + paths. + + * Makefile.am (gdk-pixbuf-marshal.c): use deps from srcdir. + add gdk-pixbuf-marshal.list to EXTRA_DIST. + take gdk-pixbuf-marshal.h out of _la sources. + 2001-03-19 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Handle gdk-pixbuf-marshal.c. diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index f7c9390e7..95ae6bdd9 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -196,10 +196,11 @@ libgdk_pixbuf_1_3_la_SOURCES = \ gdk-pixbuf-data.c \ gdk-pixbuf-io.c \ gdk-pixbuf-loader.c \ - gdk-pixbuf-marshal.h \ gdk-pixbuf-scale.c \ gdk-pixbuf-util.c +# gdk-pixbuf-marshal.h + libgdk_pixbuf_1_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ @LIBTOOL_EXPORT_OPTIONS@ \ @@ -220,6 +221,7 @@ EXTRA_DIST = \ makefile.mingw \ makefile.mingw.in \ gdk_pixbuf.def \ + gdk-pixbuf-marshal.list \ pixbufloader_ico.def \ pixbufloader_pnm.def \ pixbufloader_xpm.def \ @@ -233,13 +235,13 @@ EXTRA_DIST = \ pixbufloader_xbm.def -gdk-pixbuf-marshal.h: gdk-pixbuf-marshal.list +gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list cd $(srcdir) \ && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \ && (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \ && rm -f xgen-gmh xgen-gmh~ -gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.list +gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list cd $(srcdir) \ && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \ && (cmp -s xgen-gmc gdk-pixbuf-marshal.c || cp xgen-gmc gdk-pixbuf-marshal.c) \ diff --git a/gdk-pixbuf/gdk-pixbuf-marshal.list b/gdk-pixbuf/gdk-pixbuf-marshal.list index 79a99c785..db100651b 100644 --- a/gdk-pixbuf/gdk-pixbuf-marshal.list +++ b/gdk-pixbuf/gdk-pixbuf-marshal.list @@ -15,6 +15,7 @@ # FLOAT for single-precision float types (gfloat) # DOUBLE for double-precision float types (gdouble) # STRING for string types (gchar*) +# PARAM for GParamSpec or derived types (GParamSpec*) # BOXED for boxed (anonymous but reference counted) types (GBoxed*) # POINTER for anonymous pointer types (gpointer) # OBJECT for GObject or derived types (GObject*) diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am index 4e1231986..0c2a9bfa2 100644 --- a/gdk-pixbuf/pixops/Makefile.am +++ b/gdk-pixbuf/pixops/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libpixops.la -INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/gdk-pixbuf +INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/gdk-pixbuf noinst_PROGRAMS = timescale |