Commit 77886cc5 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik
Browse files

don't use BUILT_SOURCES as its broken in automake 1.4, add explicit object

Wed Sep 19 02:50:40 2001  Tim Janik  <timj@gtk.org>

        * demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
        as its broken in automake 1.4, add explicit object rule to
        generate this.

        * gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
        get rid of uneccessary stamps, group stuff more logically, and build
        sources due to object rules. fix srcdir!=builddir.
parent 5a43a59f
Wed Sep 19 02:50:40 2001 Tim Janik <timj@gtk.org>
* demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
as its broken in automake 1.4, add explicit object rule to
generate this.
* gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
get rid of uneccessary stamps, group stuff more logically, and build
sources due to object rules. fix srcdir!=builddir.
Tue Sep 18 20:47:16 2001 Owen Taylor <otaylor@redhat.com>
 
* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
......
Wed Sep 19 02:50:40 2001 Tim Janik <timj@gtk.org>
* demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
as its broken in automake 1.4, add explicit object rule to
generate this.
* gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
get rid of uneccessary stamps, group stuff more logically, and build
sources due to object rules. fix srcdir!=builddir.
Tue Sep 18 20:47:16 2001 Owen Taylor <otaylor@redhat.com>
 
* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
......
Wed Sep 19 02:50:40 2001 Tim Janik <timj@gtk.org>
* demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
as its broken in automake 1.4, add explicit object rule to
generate this.
* gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
get rid of uneccessary stamps, group stuff more logically, and build
sources due to object rules. fix srcdir!=builddir.
Tue Sep 18 20:47:16 2001 Owen Taylor <otaylor@redhat.com>
 
* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
......
Wed Sep 19 02:50:40 2001 Tim Janik <timj@gtk.org>
* demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
as its broken in automake 1.4, add explicit object rule to
generate this.
* gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
get rid of uneccessary stamps, group stuff more logically, and build
sources due to object rules. fix srcdir!=builddir.
Tue Sep 18 20:47:16 2001 Owen Taylor <otaylor@redhat.com>
 
* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
......
Wed Sep 19 02:50:40 2001 Tim Janik <timj@gtk.org>
* demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
as its broken in automake 1.4, add explicit object rule to
generate this.
* gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
get rid of uneccessary stamps, group stuff more logically, and build
sources due to object rules. fix srcdir!=builddir.
Tue Sep 18 20:47:16 2001 Owen Taylor <otaylor@redhat.com>
 
* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
......
Wed Sep 19 02:50:40 2001 Tim Janik <timj@gtk.org>
* demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
as its broken in automake 1.4, add explicit object rule to
generate this.
* gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
get rid of uneccessary stamps, group stuff more logically, and build
sources due to object rules. fix srcdir!=builddir.
Tue Sep 18 20:47:16 2001 Owen Taylor <otaylor@redhat.com>
 
* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
......
Wed Sep 19 02:50:40 2001 Tim Janik <timj@gtk.org>
* demos/Makefile.am ($(testpixbuf_OBJECTS)): don't use BUILT_SOURCES
as its broken in automake 1.4, add explicit object rule to
generate this.
* gdk-pixbuf/Makefile.am: fix maintainer and normal cleanfiles.
get rid of uneccessary stamps, group stuff more logically, and build
sources due to object rules. fix srcdir!=builddir.
Tue Sep 18 20:47:16 2001 Owen Taylor <otaylor@redhat.com>
 
* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
......
......@@ -20,8 +20,8 @@ GTK+ requires the following packages:
Simple install procedure
========================
% gzip -cd gtk+-1.3.7.tar.gz | tar xvf - # unpack the sources
% cd gtk+-1.3.7 # change to the toplevel directory
% gzip -cd gtk+-1.3.8.tar.gz | tar xvf - # unpack the sources
% cd gtk+-1.3.8 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GTK
[ Become root if necessary ]
......
General Information
===================
This is GTK+ version 1.3.7. GTK+, which stands for the Gimp ToolKit,
This is GTK+ version 1.3.8. GTK+, which stands for the Gimp ToolKit,
is a library for creating graphical user interfaces for the X Window
System. It is designed to be small, efficient, and flexible. GTK+ is
written in C with a very object-oriented approach.
......
......@@ -31,8 +31,6 @@ noinst_PROGRAMS = \
testpixbuf-scale \
pixbuf-demo
BUILT_SOURCES=test-inline-pixbufs.h
test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png
(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
cd $(srcdir) && \
......@@ -55,6 +53,7 @@ testanimation_LDADD = $(LDADDS)
pixbuf_demo_LDADD = $(LDADDS)
testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
$(testpixbuf_OBJECTS): test-inline-pixbufs.h
testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
testpixbuf_save_SOURCES = testpixbuf-save.c
testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
......
......@@ -398,6 +398,11 @@ Determines whether the contents of the entry widget
are visible or not. See gtk_entry_set_visibility().
</para>
<!-- ##### ARG GtkEntry:has-frame ##### -->
<para>
</para>
<!-- ##### ARG GtkEntry:invisible-char ##### -->
<para>
......
......@@ -336,6 +336,31 @@ Gtk+ 1.0.x.
@setting:
<!-- ##### SIGNAL GtkLabel::copy-clipboard ##### -->
<para>
</para>
@label: the object which received the signal.
<!-- ##### SIGNAL GtkLabel::move-cursor ##### -->
<para>
</para>
@label: the object which received the signal.
@arg1:
@arg2:
@arg3:
<!-- ##### SIGNAL GtkLabel::populate-popup ##### -->
<para>
</para>
@label: the object which received the signal.
@arg1:
<!-- ##### ARG GtkLabel:label ##### -->
<para>
The actual label text. Do not write to this pointer, it is not copied.
......
......@@ -33,6 +33,7 @@ GtkTreeViewColumn
@arrow:
@alignment:
@window:
@editable_widget:
@xalign:
@property_changed_signal:
@spacing:
......
SUBDIRS = pixops
lib_LTLIBRARIES = \
......@@ -169,9 +170,6 @@ builtin_objs = @INCLUDED_LOADER_OBJ@
endif
TESTS = test-gdk-pixbuf test-loaders
noinst_PROGRAMS = $(TESTS)
DEPS = libgdk_pixbuf-1.3.la
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) -I$(top_builddir) \
......@@ -183,18 +181,13 @@ INCLUDES = @STRIP_BEGIN@ \
@STRIP_END@
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
LDADDS = libgdk_pixbuf-1.3.la
noinst_PROGRAMS = test-gdk-pixbuf test-loaders
test_gdk_pixbuf_LDADD = $(LDADDS)
test_loaders_LDADD = $(LDADDS)
test_loaders_SOURCES = test-loaders.c test-images.h
#noinst_PROGRAMS=make-inline-pixbuf
#make_inline_pixbuf_SOURCES=make-inline-pixbuf.c
#make_inline_pixbuf_LDADD = $(LDADDS)
bin_PROGRAMS = gdk-pixbuf-csource
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_LDADD = $(LDADDS)
......@@ -208,15 +201,7 @@ man_MANS = gdk-pixbuf-csource.1
#
# The GdkPixBuf library
#
gdk_pixbuf_built_headers = gdk-pixbuf-enum-types.h
gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c
$(OBJECTS): $(gdk_pixbuf_built_headers)
libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
libgdk_pixbuf_1_3_la_SOURCES = @STRIP_BEGIN@ \
gdk-pixbuf-i18n.h \
gdk-pixbuf.c \
......@@ -229,10 +214,6 @@ libgdk_pixbuf_1_3_la_SOURCES = @STRIP_BEGIN@ \
gdk-pixdata.c \
$(gdk_pixbuf_built_cfiles) \
@STRIP_END@
$(libgdk_pixbuf_1_3_la_OBJECTS): gdk-pixbuf-marshal.h gdk-pixbuf-marshal.c
libgdk_pixbuf_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@LIBTOOL_EXPORT_OPTIONS@ \
......@@ -255,9 +236,14 @@ noinst_HEADERS = \
gdk-pixbuf-io.h \
gdk-pixbuf-private.h
gdk-pixbuf-enum-types.h: s-enum-types-h
@true
gdk_pixbuf_built_headers = gdk-pixbuf-enum-types.h gdk-pixbuf-marshal.h
gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c
MAINTAINERCLEANFILES += $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
$(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
$(srcdir)/gdk-pixbuf-enum-types.h: s-enum-types-h
@true
MAINTAINERCLEANFILES += s-enum-types-h
s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#ifndef __GDK_PIXBUF__ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n" \
......@@ -268,28 +254,50 @@ s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
&& (cmp -s tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h ) \
&& rm -f tmp-gdk-pixbuf-enum-types.h \
&& echo timestamp > $(@F)
gdk-pixbuf-enum-types.c: s-enum-types-c
CLEANFILES += tmp-gdk-pixbuf-enum-types.h
$(srcdir)/gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile
cd $(srcdir) \
&& glib-mkenums \
--fhead "#include <gdk-pixbuf/gdk-pixbuf.h>" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const GEnumValue values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_enum_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$(gdk_pixbuf_headers) > tmp-gdk-pixbuf-enum-types.c \
&& cp tmp-gdk-pixbuf-enum-types.c $(srcdir)/gdk-pixbuf-enum-types.c \
&& rm -f tmp-gdk-pixbuf-enum-types.c
CLEANFILES += tmp-gdk-pixbuf-enum-types.c
$(srcdir)/gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
@true
s-enum-types-c: @REBUILD@ $(gdk_pixbuf_headers) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#include <gdk-pixbuf/gdk-pixbuf.h>" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const GEnumValue values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_enum_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.c \
&& (cmp -s tmp-gdk-pixbuf-enum-types.c $(srcdir)/gdk-pixbuf-enum-types.c || cp tmp-gdk-pixbuf-enum-types.c $(srcdir)/gdk-pixbuf-enum-types.c ) \
&& rm -f tmp-gdk-pixbuf-enum-types.c \
MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h
stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
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~ \
&& echo timestamp > $(@F)
CLEANFILES += xgen-gmh
$(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
&& cp xgen-gmc gdk-pixbuf-marshal.c \
&& rm -f xgen-gmc xgen-gmc~
CLEANFILES += xgen-gmc
EXTRA_DIST = \
gdk-pixbuf-csource.1 \
makefile.mingw \
makefile.mingw.in \
gdk_pixbuf.def \
gdk-pixbuf-marshal.c \
gdk-pixbuf-marshal.list \
pixbufloader_ico.def \
pixbufloader_pnm.def \
......@@ -302,32 +310,3 @@ EXTRA_DIST = \
pixbufloader_tiff.def \
pixbufloader_wbmp.def \
pixbufloader_xbm.def
gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
@true
gdk-pixbuf-marshal.c: @REBUILD@ stamp-gdk-pixbuf-marshal.c
@true
stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
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~ \
&& echo timestamp > $(@F)
stamp-gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
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) \
&& rm -f xgen-gmc xgen-gmc~ \
&& echo timestamp > $(@F)
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment