AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-23 20:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Patch from James Henstridge to update to automake-1.7 (#109542)

Browse Source 
Tue May  6 16:50:52 2003  Owen Taylor  <otaylor@redhat.com>

        Patch from James Henstridge to update to automake-1.7
        (#109542)

        * autogen.sh: update to call newer tools.

        * configure.in: various updates, to use M4 macros to put
        variables that change each release at the top.
        Use AC_HELP_STRING to format help strings.
        Use AC_CONFIG_COMMANDS to generate gdkconfig.h.

        * Makefile.am: require Automake 1.7.  Remove gdk-2.0.pc and
        gtk+-2.0.pc on uninstall.  Pass --enable-gtk-doc to configure
        during distcheck.

        * docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
        makefile fragment.

        * */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
        Use BUILT_SOURCES where appropriate.
        Build generated files in builddir rather than srcdir.
        Fix uninstall and distclean targets to satisfy distcheck.

        ===

        * gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
        built first, since we are now using BUILT_SOURCES.

        * gdk/Makefile.am: Remove an outdated comment about gdk_headers.

        * demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
        with geninclude.pl.

        * configure.in: Update versions to 2.3.0.
This commit is contained in:
Owen Taylor 2003-05-06 21:55:41 +00:00 committed by Owen Taylor
parent 2e58122c79
commit 629a0e1424
30 changed files with 991 additions and 1339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ChangeLog
View File

@ -1,3 +1,39 @@
Tue May 6 16:50:52 2003 Owen Taylor <otaylor@redhat.com>
Patch from James Henstridge to update to automake-1.7
(#109542)
* autogen.sh: update to call newer tools.
* configure.in: various updates, to use M4 macros to put
variables that change each release at the top.
Use AC_HELP_STRING to format help strings.
Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
* Makefile.am: require Automake 1.7. Remove gdk-2.0.pc and
gtk+-2.0.pc on uninstall. Pass --enable-gtk-doc to configure
during distcheck.
* docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
makefile fragment.
* */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
Use BUILT_SOURCES where appropriate.
Build generated files in builddir rather than srcdir.
Fix uninstall and distclean targets to satisfy distcheck.
===
* gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
built first, since we are now using BUILT_SOURCES.
* gdk/Makefile.am: Remove an outdated comment about gdk_headers.
* demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
with geninclude.pl.
* configure.in: Update versions to 2.3.0.
2003-05-06 Tor Lillqvist <tml@iki.fi>
Fix for #110165 (thanks to Arnaud Charlet):

36
ChangeLog.pre-2-10
View File

@ -1,3 +1,39 @@
Tue May 6 16:50:52 2003 Owen Taylor <otaylor@redhat.com>
Patch from James Henstridge to update to automake-1.7
(#109542)
* autogen.sh: update to call newer tools.
* configure.in: various updates, to use M4 macros to put
variables that change each release at the top.
Use AC_HELP_STRING to format help strings.
Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
* Makefile.am: require Automake 1.7. Remove gdk-2.0.pc and
gtk+-2.0.pc on uninstall. Pass --enable-gtk-doc to configure
during distcheck.
* docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
makefile fragment.
* */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
Use BUILT_SOURCES where appropriate.
Build generated files in builddir rather than srcdir.
Fix uninstall and distclean targets to satisfy distcheck.
===
* gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
built first, since we are now using BUILT_SOURCES.
* gdk/Makefile.am: Remove an outdated comment about gdk_headers.
* demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
with geninclude.pl.
* configure.in: Update versions to 2.3.0.
2003-05-06 Tor Lillqvist <tml@iki.fi>
Fix for #110165 (thanks to Arnaud Charlet):

36
ChangeLog.pre-2-4
View File

@ -1,3 +1,39 @@
Tue May 6 16:50:52 2003 Owen Taylor <otaylor@redhat.com>
Patch from James Henstridge to update to automake-1.7
(#109542)
* autogen.sh: update to call newer tools.
* configure.in: various updates, to use M4 macros to put
variables that change each release at the top.
Use AC_HELP_STRING to format help strings.
Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
* Makefile.am: require Automake 1.7. Remove gdk-2.0.pc and
gtk+-2.0.pc on uninstall. Pass --enable-gtk-doc to configure
during distcheck.
* docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
makefile fragment.
* */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
Use BUILT_SOURCES where appropriate.
Build generated files in builddir rather than srcdir.
Fix uninstall and distclean targets to satisfy distcheck.
===
* gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
built first, since we are now using BUILT_SOURCES.
* gdk/Makefile.am: Remove an outdated comment about gdk_headers.
* demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
with geninclude.pl.
* configure.in: Update versions to 2.3.0.
2003-05-06 Tor Lillqvist <tml@iki.fi>
Fix for #110165 (thanks to Arnaud Charlet):

36
ChangeLog.pre-2-6
View File

@ -1,3 +1,39 @@
Tue May 6 16:50:52 2003 Owen Taylor <otaylor@redhat.com>
Patch from James Henstridge to update to automake-1.7
(#109542)
* autogen.sh: update to call newer tools.
* configure.in: various updates, to use M4 macros to put
variables that change each release at the top.
Use AC_HELP_STRING to format help strings.
Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
* Makefile.am: require Automake 1.7. Remove gdk-2.0.pc and
gtk+-2.0.pc on uninstall. Pass --enable-gtk-doc to configure
during distcheck.
* docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
makefile fragment.
* */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
Use BUILT_SOURCES where appropriate.
Build generated files in builddir rather than srcdir.
Fix uninstall and distclean targets to satisfy distcheck.
===
* gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
built first, since we are now using BUILT_SOURCES.
* gdk/Makefile.am: Remove an outdated comment about gdk_headers.
* demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
with geninclude.pl.
* configure.in: Update versions to 2.3.0.
2003-05-06 Tor Lillqvist <tml@iki.fi>
Fix for #110165 (thanks to Arnaud Charlet):

36
ChangeLog.pre-2-8
View File

@ -1,3 +1,39 @@
Tue May 6 16:50:52 2003 Owen Taylor <otaylor@redhat.com>
Patch from James Henstridge to update to automake-1.7
(#109542)
* autogen.sh: update to call newer tools.
* configure.in: various updates, to use M4 macros to put
variables that change each release at the top.
Use AC_HELP_STRING to format help strings.
Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
* Makefile.am: require Automake 1.7. Remove gdk-2.0.pc and
gtk+-2.0.pc on uninstall. Pass --enable-gtk-doc to configure
during distcheck.
* docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
makefile fragment.
* */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
Use BUILT_SOURCES where appropriate.
Build generated files in builddir rather than srcdir.
Fix uninstall and distclean targets to satisfy distcheck.
===
* gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
built first, since we are now using BUILT_SOURCES.
* gdk/Makefile.am: Remove an outdated comment about gdk_headers.
* demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
with geninclude.pl.
* configure.in: Update versions to 2.3.0.
2003-05-06 Tor Lillqvist <tml@iki.fi>
Fix for #110165 (thanks to Arnaud Charlet):

7
INSTALL
View File

@ -22,8 +22,8 @@ GTK+ requires the following packages:
Simple install procedure
========================
% gzip -cd gtk+-2.2.0.tar.gz | tar xvf - # unpack the sources
% cd gtk+-2.2.0 # change to the toplevel directory
% gzip -cd gtk+-2.3.0.tar.gz | tar xvf - # unpack the sources
% cd gtk+-2.3.0 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GTK
[ Become root if necessary ]
@ -41,6 +41,3 @@ Or online at:
http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html

30
Makefile.am
View File

@ -4,7 +4,7 @@ SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
# require automake 1.4
AUTOMAKE_OPTIONS = 1.4
AUTOMAKE_OPTIONS = 1.7
EXTRA_DIST = \
HACKING \
@ -148,6 +148,10 @@ install-data-hook:
rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
uninstall-local:
rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
dist-hook:
if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
@ -181,26 +185,4 @@ snapshot:
$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
# This is a version of the automake-1.4 distcheck rule modified
# to pass --enable-gtk-doc to ./configure
#
mydistcheck: dist
-rm -rf $(distdir)
GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
dc_install_base=`cd $(distdir)/=inst && pwd`; \
cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) dist
-rm -rf $(distdir)
@banner="$(distdir).tar.gz is ready for distribution"; \
dashes=`echo "$$banner" | sed s/./=/g`; \
echo "$$dashes"; \
echo "$$banner"; \
echo "$$dashes"
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc

2
README
View File

@ -1,7 +1,7 @@
General Information
===================
This is GTK+ version 2.2.0. GTK+ is a multi-platform toolkit for
This is GTK+ version 2.3.0. GTK+ is a multi-platform toolkit for
creating graphical user interfaces. Offering a complete set of widgets,
GTK+ is suitable for projects ranging from small one-off projects to
complete application suites.

60
autogen.sh
View File

@ -13,8 +13,8 @@ FILE=gdk
DIE=0
have_libtool=false
if libtool --version < /dev/null > /dev/null 2>&1 ; then
libtool_version=`libtoolize --version | libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
case $libtool_version in
1.4*|1.5*)
have_libtool=true
@ -25,34 +25,34 @@ if $have_libtool ; then : ; else
echo
echo "You must have libtool 1.4 installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
DIE=1
fi
(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have gtk-doc installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
DIE=1
}
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
echo "libtool the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
DIE=1
}
have_automake=false
if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
case $automake_version in
1.2*|1.3*|1.4)
;;
*)
have_automake=true
;;
esac
fi
if $have_automake ; then : ; else
if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-1.7
ACLOCAL=aclocal-1.7
else
echo
echo "You must have automake 1.4-p6 installed to compile $PROJECT."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p6.tar.gz"
echo "(or a newer version if it is available)"
echo "You must have automake 1.7.x installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
DIE=1
fi
@ -72,13 +72,9 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
fi
fi
case $CC in
*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
esac
if test -z "$ACLOCAL_FLAGS"; then
acdir=`aclocal-1.4 --print-ac-dir`
acdir=`$ACLOCAL --print-ac-dir`
m4list="glib-2.0.m4 glib-gettext.m4"
for file in $m4list
@ -95,13 +91,15 @@ if test -z "$ACLOCAL_FLAGS"; then
done
fi
aclocal-1.4 $ACLOCAL_FLAGS
$ACLOCAL $ACLOCAL_FLAGS || exit 1
# optionally feature autoheader
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
libtoolize --force || exit 1
gtkdocize || exit 1
automake-1.4 -a $am_opt
autoconf
autoheader || exit 1
$AUTOMAKE --add-missing || exit 1
autoconf || exit 1
cd $ORIGDIR
if test -z "$AUTOGEN_SUBDIR_MODE"; then
@ -109,4 +107,4 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
echo
echo "Now type 'make' to compile $PROJECT."
fi
fi

319
configure.in
View File

@ -1,8 +1,49 @@
# require autoconf 2.52
AC_PREREQ(2.52)
# Process this file with autoconf to produce a configure script.
AC_INIT(gdk/gdktypes.h)
# require autoconf 2.54
AC_PREREQ(2.54)
# Making releases:
# GTK_MICRO_VERSION += 1;
# GTK_INTERFACE_AGE += 1;
# GTK_BINARY_AGE += 1;
# if any functions have been added, set GTK_INTERFACE_AGE to 0.
# if backwards compatibility has been broken,
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [2])
m4_define([gtk_minor_version], [3])
m4_define([gtk_micro_version], [0])
m4_define([gtk_version],
[gtk_major_version.gtk_minor_version.gtk_micro_version])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age], [300])
# This is the X.Y used in -lgtk-FOO-X.Y
m4_define([gtk_api_version], [2.0])
# Define a string for the earliest version that this release has
# forward/backwards binary compatibility with. This is used for module
# locations. (Should this be backwards-compat instead?)
#
#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
m4_define([gtk_binary_version], [2.2.0])
# required versions of other packages
m4_define([glib_required_version], [2.1.4])
m4_define([pango_required_version], [1.0.1])
m4_define([atk_required_version], [1.0.1])
AC_INIT([gtk+], [gtk_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk+],
[gtk+])
AC_CONFIG_SRCDIR([gdk/gdktypes.h])
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
AM_INIT_AUTOMAKE(no-define)
AM_CONFIG_HEADER(config.h)
#
# For each of the libraries we build, we define the following
@ -15,31 +56,14 @@ AC_INIT(gdk/gdktypes.h)
# foo_DEP_CFLAGS: All cflags this module requires
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
dnl we to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
dnl are available for $ac_help expansion (don't we all *love* autoconf?)
GLIB_AC_DIVERT_BEFORE_HELP([
#
# Making releases:
# GTK_MICRO_VERSION += 1;
# GTK_INTERFACE_AGE += 1;
# GTK_BINARY_AGE += 1;
# if any functions have been added, set GTK_INTERFACE_AGE to 0.
# if backwards compatibility has been broken,
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
#
GTK_MAJOR_VERSION=2
GTK_MINOR_VERSION=2
GTK_MICRO_VERSION=0
GTK_INTERFACE_AGE=0
GTK_BINARY_AGE=200
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
dnl This is the X.Y used in -lgtk-FOO-X.Y
GTK_API_VERSION=2.0
])dnl
GTK_MAJOR_VERSION=gtk_major_version
GTK_MINOR_VERSION=gtk_minor_version
GTK_MICRO_VERSION=gtk_micro_version
GTK_INTERFACE_AGE=gtk_interface_age
GTK_BINARY_AGE=gtk_binary_age
GTK_VERSION=gtk_version
GTK_API_VERSION=gtk_api_version
GTK_BINARY_VERSION=gtk_binary_version
AC_SUBST(GTK_MAJOR_VERSION)
AC_SUBST(GTK_MINOR_VERSION)
AC_SUBST(GTK_MICRO_VERSION)
@ -47,6 +71,7 @@ AC_SUBST(GTK_INTERFACE_AGE)
AC_SUBST(GTK_BINARY_AGE)
AC_SUBST(GTK_API_VERSION)
AC_SUBST(GTK_VERSION)
AC_SUBST(GTK_BINARY_VERSION)
# libtool versioning
#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
@ -55,59 +80,32 @@ AC_SUBST(GTK_VERSION)
#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
LT_RELEASE=$GTK_MAJOR_VERSION.0
LT_CURRENT=`expr 100 '*' $GTK_MINOR_VERSION + $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
LT_REVISION=$GTK_INTERFACE_AGE
LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
m4_define([lt_current], [m4_eval(100 * gtk_minor_version + gtk_micro_version - gtk_interface_age)])
m4_define([lt_revision], [gtk_interface_age])
m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_interface_age)])
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_CURRENT_MINUS_AGE)
# Define a string for the earliest version that this release has
# forward/backwards binary compatibility with. This is used for module
# locations. (Should this be backwards-compat instead?)
#
#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
GTK_BINARY_VERSION=2.2.0
AC_SUBST(GTK_BINARY_VERSION)
#
# gdk-pixbuf gets versioned separately, and for now, using standard
# libtool versioning, not GTK+-style versioning
#
GDK_PIXBUF_MAJOR=$GTK_MAJOR_VERSION
GDK_PIXBUF_MINOR=$GTK_MINOR_VERSION
GDK_PIXBUF_MICRO=$GTK_MICRO_VERSION
GDK_PIXBUF_MAJOR=gtk_major_version
GDK_PIXBUF_MINOR=gtk_minor_version
GDK_PIXBUF_MICRO=gtk_micro_version
GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
AC_SUBST(GDK_PIXBUF_MAJOR)
AC_SUBST(GDK_PIXBUF_MINOR)
AC_SUBST(GDK_PIXBUF_MICRO)
AC_SUBST(GDK_PIXBUF_VERSION)
## Versions of dependencies
GLIB_REQUIRED_VERSION=2.1.4
PANGO_REQUIRED_VERSION=1.0.1
ATK_REQUIRED_VERSION=1.0.1
# For automake.
VERSION=$GTK_VERSION
PACKAGE=gtk+
GETTEXT_PACKAGE=gtk20
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
dnl Initialize automake stuff
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
# Specify a configuration file
AM_CONFIG_HEADER(config.h)
dnl Initialize libtool
AC_PROG_CC
@ -115,16 +113,7 @@ AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl XXXX Hack: Set AS and ASFLAGS so that automake 1.5 will be happy
AS="\${CC}"
ASFLAGS="\${CFLAGS}"
AC_SUBST(AS)
AC_SUBST(ASFLAGS)
dnl XXXX Hack: Set CCAS and CCASFLAGS so that automake 1.6 will be happy
CCAS="\${CC}"
CCASFLAGS="\${CFLAGS}"
AC_SUBST(CCAS)
AC_SUBST(CCASFLAGS)
AM_PROG_AS
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
@ -162,30 +151,40 @@ if test "$os_win32" = "yes"; then
fi
AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
dnl figure debugging default, prior to $ac_help setup
dnl
GLIB_AC_DIVERT_BEFORE_HELP([
if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
debug_default=yes
else
debug_default=minimum
fi
])dnl
m4_define([debug_default],
m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum]))
dnl declare --enable-* args and collect ac_help strings
AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]],
echo $enable_shm, enable_shm="yes")
AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
, enable_ansi=no)
AC_ARG_ENABLE(xkb, [ --enable-xkb support XKB [default=maybe]],
, enable_xkb="maybe")
AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
[turn on debugging @<:@default=debug_default@:>@]),,
enable_debug=debug_default)
AC_ARG_ENABLE(shm,
[AC_HELP_STRING([--enable-shm],
[support shared memory if available [default=yes]])],
[echo $enable_shm, enable_shm="yes"])
AC_ARG_ENABLE(ansi,
[AC_HELP_STRING([--enable-ansi],
[turn on strict ansi [default=no]])],,
[enable_ansi=no])
AC_ARG_ENABLE(xkb,
[AC_HELP_STRING([--enable-xkb],
[support XKB [default=maybe]])],,
[enable_xkb="maybe"])
AC_ARG_ENABLE(rebuilds,
[AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
AC_ARG_WITH(xinput, [ --with-xinput=[no/yes] support XInput ])
AC_ARG_WITH(xinput,
[AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
AC_ARG_WITH(wintab, [ --with-wintab=DIRECTORY use Wintab API with win32 backend])
AC_ARG_WITH(ie55, [ --with-ie55=DIRECTORY IE5.5 libs and headers (for Active IMM)])
AC_ARG_WITH(wintab,
[AC_HELP_STRING([--with-wintab=DIRECTORY],
[use Wintab API with win32 backend])])
AC_ARG_WITH(ie55,
[AC_HELP_STRING([--with-ie55=DIRECTORY],
[IE5.5 libs and headers (for Active IMM)])])
GLIB_AC_DIVERT_BEFORE_HELP([
if test "$platform_win32" = yes; then
@ -210,9 +209,15 @@ gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
AC_SUBST(gdktargetlib)
AC_SUBST(gtktargetlib)
AC_ARG_ENABLE(shadowfb, [ --disable-shadowfb disable shadowfb support for linux-fb],,enable_shadowfb=yes)
AC_ARG_ENABLE(shadowfb,
[AC_HELP_STRING([--disable-shadowfb],
[disable shadowfb support for linux-fb])],,
[enable_shadowfb=yes])
AC_ARG_ENABLE(fbmanager, [ --enable-fbmanager enable framebuffer manager support (GtkFB)],enable_fbmanager=yes,enable_fbmanager=no)
AC_ARG_ENABLE(fbmanager,
[AC_HELP_STRING([--enable-fbmanager],
[enable framebuffer manager support (GtkFB)])],,
enable_fbmanager=no)
if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
@ -302,7 +307,10 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
## calls. Oh, also the later pkg-config calls don't include
## the version requirements since those make the module lists
## annoying to construct
PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION atk >= $ATK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION)
PKG_CHECK_MODULES(BASE_DEPENDENCIES,
[glib-2.0 >= glib_required_version dnl
atk >= atk_required_version dnl
pango >= pango_required_version])
if test "$os_win32" != yes; then
# libtool option to control which symbols are exported
@ -319,9 +327,9 @@ dnl * See whether to include shared library dependencies *
dnl ******************************************************
AC_ARG_ENABLE(explicit-deps,
[ --enable-explicit-deps=[yes/no/auto] use explicit dependencies in .pc files [default=auto]],
enable_explicit_deps="$enableval",
enable_explicit_deps=auto)
[AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
[use explicit dependencies in .pc files [default=auto]])],,
[enable_explicit_deps=auto])
AC_MSG_CHECKING([Whether to write dependencies into .pc files])
case $enable_explicit_deps in
@ -446,10 +454,10 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
AM_PATH_GLIB_2_0(glib_required_version, :,
AC_MSG_ERROR([
*** GLIB $GLIB_REQUIRED_VERSION or better is required. The latest version of
*** GLIB is always available from ftp://ftp.gtk.org/.]),
*** GLIB glib_required_version or better is required. The latest version of
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
gobject gmodule gthread)
dnl
@ -632,7 +640,9 @@ fi
AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
AC_ARG_ENABLE(modules, [ --disable-modules disable dynamic module loading])
AC_ARG_ENABLE(modules,
[AC_HELP_STRING([--disable-modules],
[disable dynamic module loading])])
dynworks=false
deps=
@ -672,9 +682,15 @@ fi
dnl We allow people to disable image loaders explicitely, but if they don't we error
dnl out so that people don't accidentally build without them.
AC_ARG_WITH(libpng, [ --without-libpng disable PNG loader for gdk-pixbuf])
AC_ARG_WITH(libjpeg, [ --without-libjpeg disable JPEG loader for gdk-pixbuf])
AC_ARG_WITH(libtiff, [ --without-libtiff disable TIFF loader for gdk-pixbuf])
AC_ARG_WITH(libpng,
[AC_HELP_STRING([--without-libpng],
[disable PNG loader for gdk-pixbuf])])
AC_ARG_WITH(libjpeg,
[AC_HELP_STRING([--without-libjpeg],
[disable JPEG loader for gdk-pixbuf])])
AC_ARG_WITH(libtiff,
[AC_HELP_STRING([--without-libtiff],
[disable TIFF loader for gdk-pixbuf])])
dnl Test for libtiff
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
@ -793,7 +809,14 @@ AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
#
AC_MSG_CHECKING(pixbuf loaders to build)
AC_ARG_WITH(included_loaders, [ --with-included-loaders=LOADER1,LOADER2,... build the specified loaders into gdk-pixbuf (only used if module loading disabled)])
dnl due to an autoconf bug, commas in the first arg to
dnl AC_HELP_STRING cause problems.
dnl AC_HELP_STRING([--with-included-loaders=LOADER1 LOADER2 ...],
dnl [build the specified loaders into gdk-pixbuf (only used if module loading disabled)])
AC_ARG_WITH(included_loaders,
[ --with-included-loaders=LOADER1,LOADER2,...
build the specified loaders into gdk-pixbuf (only
used if module loading disabled)])
if $dynworks; then
:
@ -1438,81 +1461,16 @@ AC_SUBST(GTK_XIM_FLAGS)
# Checks for gtk-doc and docbook-tools
##################################################
AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
if test "x$with_html_dir" = "x" ; then
HTML_DIR='${datadir}/gtk-doc/html'
else
HTML_DIR=$with_html_dir
fi
AC_SUBST(HTML_DIR)
AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
gtk_doc_min_version=0.10
if $GTKDOC ; then
gtk_doc_version=`gtkdoc-mkdb --version`
AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
IFS="${IFS= }"; gtk_save_IFS="$IFS"; IFS="."
set $gtk_doc_version
for min in $gtk_doc_min_version ; do
cur=$1; shift
if test -z $min ; then break; fi
if test -z $cur ; then GTKDOC=false; break; fi
if test $cur -gt $min ; then break ; fi
if test $cur -lt $min ; then GTKDOC=false; break ; fi
done
IFS="$gtk_save_IFS"
if $GTKDOC ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
fi
GTK_DOC_CHECK([1.0])
AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
dnl Make people enable the gtk-doc stuff explicitely.
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
if test x$enable_gtk_doc = xyes ; then
if test x$GTKDOC != xtrue ; then
enable_gtk_doc=no
fi
fi
dnl NOTE: We need to use a separate automake conditional for this
dnl to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
##################################################
# Output commands
##################################################
AC_OUTPUT_COMMANDS([
## Generate `gdk/gdkconfig.h' in two cases
## 1. `config.status' is run either explicitly, or via configure.
## Esp. not when it is run in `Makefile' to generate makefiles and
## config.h
## 2. CONFIG_OTHER is set explicitly
##
## Case 1 is difficult. We know that `automake' sets one of
## CONFIG_FILES or CONFIG_HEADERS to empty. This heuristic works
## only when AM_CONFIG_HEADER is set, however.
if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
# Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
CONFIG_OTHER=${CONFIG_OTHER:-gdk/gdkconfig.h}
fi
case "$CONFIG_OTHER" in
*gdk/gdkconfig.h*)
echo creating gdk/gdkconfig.h
AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
outfile=gdkconfig.h-tmp
cat > $outfile <<\_______EOF
/* gdkconfig.h
@ -1545,12 +1503,11 @@ _______EOF
if cmp -s $outfile gdk/gdkconfig.h; then
echo gdk/gdkconfig.h is unchanged
AC_MSG_NOTICE([gdk/gdkconfig.h is unchanged])
rm -f $outfile
else
mv $outfile gdk/gdkconfig.h
fi ;;
esac
fi
],[
if test "x$gdktarget" = "xx11" ; then
gdk_windowing='
@ -1583,7 +1540,7 @@ fi
AC_PATH_PROG(SGML2HTML, sgml2html, no)
AM_CONDITIONAL(HAVE_SGML2HTML, test x$SGML2HTML != xno)
AC_OUTPUT([
AC_CONFIG_FILES([
config.h.win32
gtk-zip.sh
Makefile
@ -1634,3 +1591,5 @@ contrib/Makefile
contrib/gdk-pixbuf-xlib/Makefile
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
])
AC_OUTPUT

7
contrib/Makefile.am
View File

@ -1,8 +1,5 @@
SUBDIRS =
if USE_X11
XDIRS=gdk-pixbuf-xlib
else
XDIRS=
SUBDIRS += gdk-pixbuf-xlib
endif
SUBDIRS=$(XDIRS)

9
contrib/gdk-pixbuf-xlib/Makefile.am
View File

@ -1,20 +1,19 @@
lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_srcdir)/contrib \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GDK_PIXBUF_XLIB_DEP_CFLAGS@ \
@STRIP_END@
$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
-export-dynamic \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-version-info $(LT_VERSION_INFO)
libgdk_pixbuf_xlib_2_0_la_LIBADD = \
@GDK_PIXBUF_XLIB_DEP_LIBS@
$(GDK_PIXBUF_XLIB_DEP_LIBS)
libgdk_pixbuf_xlib_2_0_la_SOURCES = \
gdk-pixbuf-xlib-private.h \

25
demos/Makefile.am
View File

@ -2,27 +2,25 @@
SUBDIRS = gtk-demo
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = @STRIP_BEGIN@ \
LDADDS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@STRIP_END@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
noinst_PROGRAMS = \
testpixbuf \
@ -38,6 +36,8 @@ else
pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$topdir/gdk-pixbuf/gdk-pixbuf-csource
endif
BUILT_SOURCES = test-inline-pixbufs.h
test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders apple-red.png gnome-foot.png
(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
cd $(srcdir) && \
@ -59,7 +59,6 @@ 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
@ -76,3 +75,5 @@ EXTRA_DIST = \
gnome-gmush.png \
gnome-gsame.png \
gnu-keys.png
DISTCLEANFILES = test-inline-pixbufs.h

61
demos/gtk-demo/Makefile.am
View File

@ -4,27 +4,26 @@ democodedir=$(datadir)/gtk-2.0/demo
## These should be in the order you want them to appear in the
## demo app, which means alphabetized by demo title, not filename
demos = @STRIP_BEGIN@ \
appwindow.c \
button_box.c \
changedisplay.c \
colorsel.c \
dialog.c \
drawingarea.c \
editable_cells.c \
images.c \
item_factory.c \
list_store.c \
menus.c \
panes.c \
pixbufs.c \
sizegroup.c \
stock_browser.c \
textview.c \
tree_store.c \
@STRIP_END@
demos = \
appwindow.c \
button_box.c \
changedisplay.c \
colorsel.c \
dialog.c \
drawingarea.c \
editable_cells.c \
images.c \
item_factory.c \
list_store.c \
menus.c \
panes.c \
pixbufs.c \
sizegroup.c \
stock_browser.c \
textview.c \
tree_store.c
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-DDEMOCODEDIR="\"$(democodedir)\"" \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
@ -32,20 +31,18 @@ INCLUDES = @STRIP_BEGIN@ \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = @STRIP_BEGIN@ \
LDADDS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@STRIP_END@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
bin_PROGRAMS = gtk-demo
@ -54,8 +51,8 @@ BUILT_SOURCES = demos.h
EXTRA_DIST = \
$(IMAGEFILES)
demos.h: $(demos) geninclude.pl
(cd $(srcdir) && $(PERL) ./geninclude.pl $(demos) > demos.h)
demos.h: @REBUILD@ $(demos) geninclude.pl
(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
gtk_demo_SOURCES = \
$(demos) \
@ -80,3 +77,5 @@ IMAGEFILES= alphatest.png \
gtk-logo-rgb.gif
democode_DATA = $(demos) $(IMAGEFILES)
DISTCLEANFILES = demos.h

18
docs/faq/Makefile.am
View File

@ -2,14 +2,18 @@ EXTRA_DIST = \
gtk-faq.sgml
if HAVE_DOCBOOK
html:
(cd $(srcdir); \
db2html gtk-faq.sgml; \
test -d html && rm -r html; \
mv gtk-faq html)
html:
if test -w $(srcdir); then \
(cd $(srcdir); \
db2html gtk-faq.sgml; \
test -d html && rm -r html; \
mv gtk-faq html); \
fi
pdf:
(cd $(srcdir); db2pdf gtk-faq.sgml)
if test -w $(srcdir); then \
(cd $(srcdir); db2pdf gtk-faq.sgml); \
fi
dist-hook: html
cp -Rp $(srcdir)/html $(distdir)
@ -26,7 +30,7 @@ pdf:
dist-hook:
echo "***"
echo "*** Warning: Tutorial not built"
echo "*** Warning: FAQ not built"
echo "*** DISTRIBUTION IS INCOMPLETE"
echo "***"
endif

194
docs/reference/gdk-pixbuf/Makefile.am
View File

@ -1,22 +1,18 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
DOC_MODULE=gdk-pixbuf
# The top-level SGML file.
DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gdk-pixbuf
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib --deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gdk-pixbuf
# Used for dependencies
HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
@ -33,11 +29,22 @@ IGNORE_HFILES= \
io-ani-animation.h \
test-images.h
# Extra files to add when scanning
EXTRA_HFILES=
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/gdk \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
# Images to copy into HTML directory
HTML_IMAGES =
GTKDOC_LIBS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
# Extra SGML files that are included by DOC_MAIN_SGML_FILE
content_files = \
@ -47,158 +54,13 @@ content_files = \
gdk-pixbuf.sgml \
porting-from-imlib.sgml
# Images to copy into HTML directory
HTML_IMAGES =
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=
include $(top_srcdir)/gtk-doc.make
# Other files to distribute
extra_files = version.xml.in
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS = @STRIP_BEGIN@ \
@CFLAGS@ \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/gdk \
@GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@GTK_DEP_LIBS@ \
@STRIP_END@
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
####################################
# Everything below here is generic #
####################################
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
# whether a source that is a target of one rule is then
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \
$(content_files) \
$(extra_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
$(DOC_MODULE).interfaces \
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
if ENABLE_GTK_DOC
all-local: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
fi
cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
@true
#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
#### sgml ####
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
@echo '*** Building SGML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo '-- Fixing Crossreferences'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
endif
##############
clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi)
#
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist"
@false
endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local
EXTRA_DIST += version.xml.in

193
docs/reference/gdk/Makefile.am
View File

@ -1,22 +1,18 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
DOC_MODULE=gdk
# The top-level SGML file.
DOC_MAIN_SGML_FILE=gdk-docs.sgml
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gdk
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gdk
# Used for dependencies
HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
@ -40,6 +36,26 @@ IGNORE_HFILES= \
EXTRA_HFILES= \
../../../gdk/x11/gdkx.h
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/gdk \
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Extra SGML files that are included by DOC_MAIN_SGML_FILE
content_files = \
version.xml \
multihead.sgml
# Images to copy into HTML directory
HTML_IMAGES = \
images/X_cursor.png \
@ -120,161 +136,10 @@ HTML_IMAGES = \
images/watch.png \
images/xterm.png
# Extra SGML files that are included by DOC_MAIN_SGML_FILE
content_files = \
version.xml \
multihead.sgml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
include $(top_srcdir)/gtk-doc.make
# Other files to distribute
extra_files = version.xml.in
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS = @STRIP_BEGIN@ \
@CFLAGS@ \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/gdk \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk/@gdktargetlib@ \
@STRIP_END@
# Commands for compiling and linking
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
####################################
# Everything below here is generic #
####################################
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
# whether a source that is a target of one rule is then
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \
$(content_files) \
$(extra_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
$(DOC_MODULE).interfaces \
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
if ENABLE_GTK_DOC
all-local: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
fi
cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
@true
#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
#### sgml ####
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
@echo '*** Building SGML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo '-- Fixing Crossreferences'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
endif
##############
clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi)
#
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist"
@false
endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local
EXTRA_DIST += version.xml.in

227
docs/reference/gtk/Makefile.am
View File

@ -1,25 +1,21 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
DOC_MODULE=gtk
# The top-level SGML file.
DOC_MAIN_SGML_FILE=gtk-docs.sgml
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gtk
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
# Extra options to pass to gtkdoc-scangobj
SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)"
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gtk
# Used for dependencies
HFILE_GLOB=$(top_srcdir)/gtk/*.h
@ -51,6 +47,42 @@ IGNORE_HFILES= \
gtktypebuiltins.h \
xembed.h
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/gdk \
-DGTK_ENABLE_BROKEN \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
content_files = \
version.xml \
running.sgml \
building.sgml \
changes-1.2.sgml \
changes-2.0.sgml \
compiling.sgml \
framebuffer.sgml \
objects_grouped.sgml \
question_index.sgml \
resources.sgml \
text_widget.sgml \
tree_widget.sgml \
windows.sgml \
x11.sgml
# Images to copy into HTML directory
HTML_IMAGES = \
$(top_srcdir)/gtk/stock-icons/stock_add_24.png \
@ -124,175 +156,10 @@ HTML_IMAGES = \
$(top_srcdir)/gtk/stock-icons/stock_zoom_in_24.png \
$(top_srcdir)/gtk/stock-icons/stock_zoom_out_24.png
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
content_files = \
version.xml \
running.sgml \
building.sgml \
changes-1.2.sgml \
changes-2.0.sgml \
compiling.sgml \
framebuffer.sgml \
objects_grouped.sgml \
question_index.sgml \
resources.sgml \
text_widget.sgml \
tree_widget.sgml \
windows.sgml \
x11.sgml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
include $(top_srcdir)/gtk-doc.make
# Other files to distribute
extra_files = version.xml.in
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS = @STRIP_BEGIN@ \
@CFLAGS@ \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/gdk \
-DGTK_ENABLE_BROKEN \
@GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@STRIP_END@
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
####################################
# Everything below here is generic #
####################################
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
# whether a source that is a target of one rule is then
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \
$(content_files) \
$(extra_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
$(DOC_MODULE).interfaces \
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
if ENABLE_GTK_DOC
all-local: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
fi
cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
@true
#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
#### sgml ####
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
@echo '*** Building SGML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo '-- Fixing Crossreferences'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
endif
##############
clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi)
#
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist"
@false
endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local
EXTRA_DIST += version.xml.in

20
docs/tutorial/Makefile.am
View File

@ -35,16 +35,20 @@ EXTRA_DIST = \
images/tictactoe.png
if HAVE_DOCBOOK
html:
(cd $(srcdir); \
db2html gtk-tut.sgml; \
test -d html && rm -r html; \
mv gtk-tut html; \
mkdir html/images; \
cp images/*.png html/images)
html:
if test -w $(srcdir); then \
(cd $(srcdir); \
db2html gtk-tut.sgml; \
test -d html && rm -r html; \
mv gtk-tut html; \
mkdir html/images; \
cp images/*.png html/images); \
fi
pdf:
(cd $(srcdir); db2pdf gtk-tut.sgml)
if test -w $(srcdir); then \
(cd $(srcdir); db2pdf gtk-tut.sgml); \
fi
dist-hook: html
cp -Rp $(srcdir)/html $(distdir)

128
gdk-pixbuf/Makefile.am
View File

@ -238,21 +238,20 @@ builtin_objs = @INCLUDED_LOADER_OBJ@
endif
DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-DG_LOG_DOMAIN=\"GdkPixbuf\" \
-I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
-DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
-DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@INCLUDED_LOADER_DEFINE@ \
@GTK_DEBUG_FLAGS@ \
@GDK_PIXBUF_DEP_CFLAGS@ \
-DGDK_PIXBUF_ENABLE_BACKEND \
@STRIP_END@
$(INCLUDED_LOADER_DEFINE) \
$(GTK_DEBUG_FLAGS) \
$(GDK_PIXBUF_DEP_CFLAGS) \
-DGDK_PIXBUF_ENABLE_BACKEND
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
@ -280,7 +279,7 @@ man_MANS = gdk-pixbuf-csource.1
# The GdkPixBuf library
#
libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \
libgdk_pixbuf_2_0_la_SOURCES = \
gdk-pixbuf-i18n.h \
gdk-pixbuf.c \
gdk-pixbuf-animation.c \
@ -290,14 +289,14 @@ libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \
gdk-pixbuf-scale.c \
gdk-pixbuf-util.c \
gdk-pixdata.c \
$(gdk_pixbuf_built_cfiles) \
@STRIP_END@
libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@LIBTOOL_EXPORT_OPTIONS@ \
$(no_undefined) \
$(gdk_pixbuf_symbols) \
@STRIP_END@
gdk-pixbuf-enum-types.c
libgdk_pixbuf_2_0_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \
$(LIBTOOL_EXPORT_OPTIONS) \
$(no_undefined) \
$(gdk_pixbuf_symbols)
libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32res_lo)
@ -310,24 +309,27 @@ gdk_pixbuf_headers = \
libgdk_pixbufinclude_HEADERS = \
$(gdk_pixbuf_headers) \
$(gdk_pixbuf_built_headers) \
gdk-pixbuf-enum-types.h \
gdk-pixbuf-marshal.h \
gdk-pixbuf-features.h \
gdk-pixdata.h
noinst_HEADERS = \
gdk-pixbuf-private.h
gdk_pixbuf_built_headers = gdk-pixbuf-enum-types.h gdk-pixbuf-marshal.h
gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c
$(libgdk_pixbuf_2_0_la_OBJECTS) $(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
BUILT_SOURCES = gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.c \
gdk-pixbuf-marshal.h gdk-pixbuf-marshal.c
CLEANFILES =
MAINTAINERCLEANFILES = $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
MAINTAINERCLEANFILES = \
gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.c \
gdk-pixbuf-marshal.h gdk-pixbuf-marshal.c \
gdk-pixbuf.loaders
#
# gdk-pixbuf-enum-types.h
#
$(srcdir)/gdk-pixbuf-enum-types.h: s-enum-types-h
gdk-pixbuf-enum-types.h: s-enum-types-h
@true
s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
@ -337,7 +339,7 @@ s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \
$(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \
&& (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 ) \
&& (cmp -s tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h ) \
&& rm -f tmp-gdk-pixbuf-enum-types.h \
&& echo timestamp > $(@F)
@ -347,30 +349,25 @@ MAINTAINERCLEANFILES += s-enum-types-h
#
# gdk-pixbuf-enum-types.c
#
$(srcdir)/gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile
cd $(srcdir) && glib-mkenums \
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 G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$(gdk_pixbuf_headers) > gdk-pixbuf-enum-types.c
$(gdk_pixbuf_headers)) > gdk-pixbuf-enum-types.c
#
# gdk-pixbuf-marshal.h
#
$(srcdir)/gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
@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~ \
$(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal $(srcdir)/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
@ -380,36 +377,38 @@ MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h
# gdk-pixbuf-marshal.c
#
$(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 \
$(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal $(srcdir)/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.msc \
gdk_pixbuf.def \
gdk_pixbuf.rc \
gdk-pixbuf-marshal.c \
gdk-pixbuf-marshal.list \
pixbufloader_ico.def \
pixbufloader_ani.def \
pixbufloader_pnm.def \
pixbufloader_xpm.def \
pixbufloader_bmp.def \
pixbufloader_jpeg.def \
pixbufloader_ras.def \
pixbufloader_gif.def \
pixbufloader_png.def \
pixbufloader_tiff.def \
pixbufloader_wbmp.def \
pixbufloader_xbm.def \
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
distclean-local:
if test $(srcdir) != .; then \
rm -f $(MAINTAINERCLEANFILES); \
fi
EXTRA_DIST = \
gdk-pixbuf-csource.1 \
makefile.msc \
gdk_pixbuf.def \
gdk_pixbuf.rc \
gdk-pixbuf-marshal.c \
gdk-pixbuf-marshal.list \
pixbufloader_ico.def \
pixbufloader_ani.def \
pixbufloader_pnm.def \
pixbufloader_xpm.def \
pixbufloader_bmp.def \
pixbufloader_jpeg.def \
pixbufloader_ras.def \
pixbufloader_gif.def \
pixbufloader_png.def \
pixbufloader_tiff.def \
pixbufloader_wbmp.def \
pixbufloader_xbm.def \
pixbufloader_tga.def
if CROSS_COMPILING
@ -433,6 +432,9 @@ install-data-local: install-ms-lib install-libtool-import-lib
echo "***" ; \
fi
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
if CROSS_COMPILING
else
all-local: gdk-pixbuf.loaders
@ -448,5 +450,3 @@ gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
touch gdk-pixbuf.loaders; \
fi
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib

9
gdk-pixbuf/pixops/Makefile.am
View File

@ -1,12 +1,11 @@
noinst_LTLIBRARIES = libpixops.la
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-I$(top_srcdir) -I$(top_builddir) \
@GTK_DEBUG_FLAGS@ \
@GDK_PIXBUF_DEP_CFLAGS@ \
$(GTK_DEBUG_FLAGS) \
$(GDK_PIXBUF_DEP_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@STRIP_END@
-DGDK_PIXBUF_DISABLE_DEPRECATED
noinst_PROGRAMS = timescale

188
gdk/Makefile.am
View File

@ -1,7 +1,7 @@
## Makefile.am for gtk+/gdk
SUBDIRS=$(gdktarget)
DIST_SUBDIRS=linux-fb win32 x11
SUBDIRS = $(gdktarget)
DIST_SUBDIRS = linux-fb win32 x11
EXTRA_DIST = \
gdkconfig.h.win32 \
@ -10,7 +10,7 @@ EXTRA_DIST = \
makeenums.pl \
makefile.msc
common_includes = @STRIP_BEGIN@ \
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-I$(top_srcdir) \
@ -19,66 +19,25 @@ common_includes = @STRIP_BEGIN@ \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
@STRIP_END@
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
INCLUDES = $(common_includes)
gtarget=@gdktarget@
gtarget=$(gdktarget)
if PLATFORM_WIN32
no_undefined = -no-undefined
if HAVE_WINTAB
wintab_lib = -Lwin32 -lwntab32x
endif
if HAVE_IE55
ie55uuid_lib = -Lwin32 -lie55uuid
endif
endif
if OS_WIN32
gdk_win32_symbols = -export-symbols gdk.def
install-libtool-import-lib:
$(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgdk-win32-$(GTK_API_VERSION).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
install-ms-lib:
$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib
else
install-ms-lib:
uninstall-ms-lib:
endif
# libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here
LDFLAGS = @STRIP_BEGIN@ \
@LDFLAGS@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
LDADD = \
-version-info $(LT_VERSION_INFO) \
-export-dynamic \
-rpath $(libdir) \
$(no_undefined) \
@LIBTOOL_EXPORT_OPTIONS@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(gdk_win32_symbols) \
@STRIP_END@
$(LIBTOOL_EXPORT_OPTIONS)
#
# setup source file variables
@ -86,9 +45,7 @@ LDFLAGS = @STRIP_BEGIN@ \
#
# GDK header files for public installation (non-generated)
#
# Note: files added here may need to be be propagated to gdk_headers in gtk/Makefile.am
#
gdk_public_h_sources = @STRIP_BEGIN@ \
gdk_public_h_sources = \
gdk.h \
gdkcolor.h \
gdkcursor.h \
@ -114,16 +71,14 @@ gdk_public_h_sources = @STRIP_BEGIN@ \
gdkselection.h \
gdktypes.h \
gdkvisual.h \
gdkwindow.h \
@STRIP_END@
gdkwindow.h
gdk_headers = @STRIP_BEGIN@ \
gdk_headers = \
$(gdk_public_h_sources) \
gdkenumtypes.h \
gdkprivate.h \
@STRIP_END@
gdkprivate.h
gdk_c_sources = @STRIP_BEGIN@ \
gdk_c_sources = \
gdk.c \
gdkcolor.c \
gdkcursor.c \
@ -153,8 +108,7 @@ gdk_c_sources = @STRIP_BEGIN@ \
gdkscreen.c \
gdkselection.c \
gdkvisual.c \
gdkwindow.c \
@STRIP_END@
gdkwindow.c
#
# setup GDK sources and their dependancies
@ -164,28 +118,66 @@ gdkincludedir = $(includedir)/gtk-2.0/gdk
gdkinclude_HEADERS = $(gdk_headers)
# gdkmarshalers.c is not here becuase it is currently an empty file
common_sources = @STRIP_BEGIN@ \
common_sources = \
$(gdk_c_sources) \
gdkenumtypes.c \
gdkmarshalers.h \
@STRIP_END@
gdkmarshalers.h
libgdk_x11_2_0_la_SOURCES = $(common_sources)
libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la @GDK_DEP_LIBS@
libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la @GDK_DEP_LIBS@
libgdk_win32_2_0_la_LIBADD = \
win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib) \
@GDK_DEP_LIBS@
libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
libgdk_linux_fb_2_0_la_LDFLAGS = $(LDADD)
libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
libgdk_win32_2_0_la_DEPENDENCIES = gdk.def
libgdk_win32_2_0_la_LDFLAGS = -export-symbols gdk.def $(LDADD)
if HAVE_WINTAB
libgdk_win32_2_0_la_LIBADD += -Lwin32 -lwntab32x
endif
if HAVE_IE55
libgdk_win32_2_0_la_LIBADD += -Lwin32 -lie55uuid
endif
if OS_WIN32
install-libtool-import-lib:
$(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgdk-win32-$(GTK_API_VERSION).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
install-ms-lib:
$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib
else
install-ms-lib:
uninstall-ms-lib:
endif
lib_LTLIBRARIES = $(gdktargetlib)
EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la
MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h
MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \
gdkmarshalers.h gdkmarshalers.c
EXTRA_HEADERS =
#
@ -206,12 +198,14 @@ if DISABLE_EXPLICIT_DEPS
endif
#note: not gdkconfig.h
BUILT_SOURCES = stamp-gc-h
BUILT_SOURCES = \
gdkenumtypes.h \
gdkenumtypes.c \
gdkmarshalers.h \
gdkmarshalers.c \
gdkconfig.h
# Generate built header without using automake-1.4 BUILT_SOURCES
$(libgdk_x11_2_0_la_OBJECTS) $(libgdk_linux_fb_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_OBJECTS): gdkenumtypes.h gdkmarshalers.h
$(srcdir)/gdkenumtypes.h: stamp-gdkenumtypes.h
gdkenumtypes.h: stamp-gdkenumtypes.h
@true
stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \
@ -220,10 +214,10 @@ stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* __GDK_ENUM_TYPES_H__ */" \
$(gdk_public_h_sources) ) >> xgen-geth \
&& (cmp -s xgen-geth $(srcdir)/gdkenumtypes.h || cp xgen-geth $(srcdir)/gdkenumtypes.h ) \
&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
&& rm -f xgen-geth \
&& echo timestamp > $(@F)
$(srcdir)/gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
@ -231,33 +225,41 @@ $(srcdir)/gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$(gdk_public_h_sources) ) > xgen-getc \
&& cp xgen-getc $(srcdir)/gdkenumtypes.c \
&& cp xgen-getc gdkenumtypes.c \
&& rm -f xgen-getc
#
# Marshaller generation
#
$(srcdir)/gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
cd $(srcdir) && \
( @GLIB_GENMARSHAL@ --prefix=gdk_marshal gdkmarshalers.list --header > gdkmarshalers.tmp \
&& mv gdkmarshalers.tmp gdkmarshalers.h ) \
|| ( rm -f gdkmarshalers.tmp && exit 1 )
$(srcdir)/gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
cd $(srcdir) && \
$( @GLIB_GENMARSHAL@ --prefix=gdk_marshal gdkmarshalers.list --body > gdkmarshalers.tmp \
&& mv gdkmarshalers.tmp gdkmarshalers.c ) \
|| ( rm -f gdkmarshalers.tmp && exit 1 )
gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
$(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
|| ( rm -f gdkmarshalers-h.tmp && exit 1)
gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
$(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp \
&& mv gdkmarshalers-c.tmp gdkmarshalers.c \
|| ( rm -f gdkmarshalers-c.tmp && exit 1 )
gdkconfig.h: stamp-gc-h
@if test -f gdkconfig.h; then :; \
else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
stamp-gc-h: ../config.status
cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
stamp-gc-h: $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
echo timestamp > stamp-gc-h
DISTCLEANFILES = gdkconfig.h stamp-gc-h
install-data-local: install-ms-lib install-libtool-import-lib
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
distclean-local:
if test $(srcdir) != .; then \
rm -f $(MAINTAINERCLEANFILES); \
fi
.PHONY: files

22
gdk/linux-fb/Makefile.am
View File

@ -1,15 +1,15 @@
## Process this file with automake to produce Makefile.in
bin_PROGRAMS =
if ENABLE_FB_MANAGER
bin_PROGRAMS = gdkfbmanager gdkfbswitch
else
bin_PROGRAMS =
bin_PROGRAMS += gdkfbmanager gdkfbswitch
endif
libgdkincludedir = $(includedir)/gtk-2.0/gdk
libgdkfbincludedir = $(includedir)/gtk-2.0/gdk/linux-fb
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_DATA_PREFIX=\"$(prefix)\" \
-I$(top_srcdir) \
@ -17,9 +17,8 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GDK_DEP_CFLAGS@ \
@GTK_DEBUG_FLAGS@ \
@STRIP_END@
$(GDK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS)
noinst_LTLIBRARIES = libgdk-linux-fb.la
@ -82,12 +81,3 @@ gdkfbswitch_sources = gdkfbswitch.c
gdkfbswitch_LDFLAGS = $(GLIB_LIBS)
EXTRA_DIST=x-cursors.xbm
###########################################
# Hack to get gdkenumtypes.h built first
###########################################
$(libgdk_linux_fb_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h
$(top_srcdir)/gdk/gdkenumtypes.h:
@cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h

28
gdk/win32/Makefile.am
View File

@ -2,33 +2,30 @@
libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DINSIDE_GDK_WIN32 \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
@GDK_WIN32_EXTRA_CFLAGS@\
-DGDK_COMPILATION \
@STRIP_END@
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS) \
$(GDK_WIN32_EXTRA_CFLAGS)\
-DGDK_COMPILATION
LDADDS = @STRIP_BEGIN@ \
@GDK_DEP_LIBS@ \
@STRIP_END@
LDADDS = $(GDK_DEP_LIBS)
if HAVE_WINTAB
libwntab32x_a = .libs/libwntab32x.a
.libs/libwntab32x.a: @WINTAB_LIB@
.libs/libwntab32x.a: $(WINTAB_LIB)
cp $< $@
endif
if HAVE_IE55
libie55uuid_a = .libs/libie55uuid.a
.libs/libie55uuid.a: @IE55_UUID_LIB@
.libs/libie55uuid.a: $(IE55_UUID_LIB)
cp $< $@
endif
@ -81,12 +78,3 @@ libgdkinclude_HEADERS = \
gdkwin32.h
libgdk_win32_la_LIBADD = rc/gdk-win32res.lo
###########################################
# Hack to get gdkenumtypes.h built first
###########################################
$(libgdk_win32_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h
$(top_srcdir)/gdk/gdkenumtypes.h:
@cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h

39
gdk/x11/Makefile.am
View File

@ -2,7 +2,7 @@
libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-I$(top_srcdir) \
@ -11,25 +11,13 @@ INCLUDES = @STRIP_BEGIN@ \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
@STRIP_END@
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
LDADDS = @STRIP_BEGIN@ \
@GDK_DEP_LIBS@ \
@STRIP_END@
LDADDS = $(GDK_DEP_LIBS)
noinst_LTLIBRARIES = libgdk-x11.la
if XINPUT_XFREE
xinput_sources = \
gdkinput-x11.c \
gdkinput-xfree.c
else
xinput_sources = \
gdkinput-none.c
endif
libgdk_x11_la_SOURCES = \
MwmUtil.h \
gdkcolor-x11.c \
@ -66,8 +54,14 @@ libgdk_x11_la_SOURCES = \
xsettings-client.h \
xsettings-client.c \
xsettings-common.h \
xsettings-common.c \
$(xinput_sources)
xsettings-common.c
if XINPUT_XFREE
libgdk_x11_la_SOURCES += gdkinput-x11.c gdkinput-xfree.c
else
libgdk_x11_la_SOURCES += gdkinput-none.c
endif
libgdkinclude_HEADERS = \
gdkx.h
@ -78,12 +72,3 @@ EXTRA_DIST = \
gdkinput-x11.c \
gdkinput-xfree.c \
gdkinput-none.c
###########################################
# Hack to get gdkenumtypes.h built first
###########################################
$(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h
$(top_srcdir)/gdk/gdkenumtypes.h:
@cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h

189
gtk/Makefile.am
View File

@ -2,14 +2,14 @@
SUBDIRS=stock-icons theme-bits
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
-DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
-DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
-DGTK_HOST=\"@host@\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGTK_HOST=\"$(host)\" \
-DGTK_COMPILATION \
-I$(top_builddir)/gtk \
-I$(top_srcdir) -I../gdk \
@ -19,11 +19,10 @@ INCLUDES = @STRIP_BEGIN@ \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
gtarget=@gdktarget@
gtarget=$(gdktarget)
if PLATFORM_WIN32
no_undefined = -no-undefined
@ -67,18 +66,17 @@ endif
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here
libgtkincludedir = $(includedir)/gtk-2.0/gtk
LDFLAGS = @STRIP_BEGIN@ \
@LDFLAGS@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \
-rpath $(libdir) \
$(no_undefined) \
@LIBTOOL_EXPORT_OPTIONS@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(libgtk_target_ldflags) \
@GTK_DEP_LIBS@ \
@STRIP_END@
libadd = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS)
# common options for the various packages.
libtool_opts = \
-version-info $(LT_VERSION_INFO) \
-export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \
-rpath $(libdir) $(libgtk_target_ldflags)
#
# setup source file variables
@ -86,7 +84,7 @@ LDFLAGS = @STRIP_BEGIN@ \
# GTK+ header files for public installation (non-generated, or generated
# by configure)
gtk_public_h_sources = @STRIP_BEGIN@ \
gtk_public_h_sources = \
gtk.h \
gtkaccelgroup.h \
gtkaccellabel.h \
@ -228,10 +226,10 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
gtkvscrollbar.h \
gtkvseparator.h \
gtkwidget.h \
gtkwindow.h \
@STRIP_END@
gtkwindow.h
# GTK+ header files that don't get installed
gtk_private_h_sources = @STRIP_BEGIN@ \
gtk_private_h_sources = \
gtkrbtree.h \
gtktextbtree.h \
gtktextchildprivate.h \
@ -244,10 +242,10 @@ gtk_private_h_sources = @STRIP_BEGIN@ \
gtkthemes.h \
gtktreedatalist.h \
gtktreeprivate.h \
gtkwindow-decorate.h \
@STRIP_END@
gtkwindow-decorate.h
# GTK+ C sources to build the library from
gtk_c_sources = @STRIP_BEGIN@ \
gtk_c_sources = \
gtkaccelgroup.c \
gtkaccelmap.c \
gtkaccellabel.c \
@ -403,13 +401,11 @@ gtk_c_sources = @STRIP_BEGIN@ \
gtkwindow.c \
gtkwindow-decorate.c \
fnmatch.c \
xembed.h \
@STRIP_END@
xembed.h
gtk_plug_c_sources = @STRIP_BEGIN@ \
gtk_plug_c_sources = \
gtkplug.c \
gtksocket.c \
@STRIP_END@
gtksocket.c
# we use our own built_sources variable rules to avoid automake's
# BUILT_SOURCES oddities
@ -418,35 +414,34 @@ gtk_plug_c_sources = @STRIP_BEGIN@ \
# content
# built sources that get installed with the header files
gtk_built_public_sources = @STRIP_BEGIN@ \
gtkmarshal.h \
gtktypebuiltins.h \
@STRIP_END@
gtk_built_private_headers = @STRIP_BEGIN@ \
gtkmarshalers.h \
@STRIP_END@
gtk_built_public_sources = \
gtkmarshal.h \
gtktypebuiltins.h
gtk_built_private_headers = \
gtkmarshalers.h
# built sources that don't get installed
gtk_built_sources = @STRIP_BEGIN@ \
gtk_built_sources = \
gtktypebuiltins.c \
gtkmarshalers.c \
gtkmarshalers.h \
gtkmarshal.c \
${gtk_built_private_headers} \
${gtk_built_public_sources} \
@STRIP_END@
stamp_files = @STRIP_BEGIN@ \
stamp-gtkmarshalers.h \
stamp-gtkmarshal.h \
stamp-gtktypebuiltins.h \
@STRIP_END@
${gtk_built_public_sources}
stamp_files = \
stamp-gtkmarshalers.h \
stamp-gtkmarshal.h \
stamp-gtktypebuiltins.h
# non-header sources (headers should be specified in the above variables)
# that don't serve as direct make target sources, i.e. they don't have
# their own .lo rules and don't get publically installed
gtk_extra_sources = @STRIP_BEGIN@ \
gtkversion.h.in \
gtkmarshalers.list \
gtkmarshal.list \
@STRIP_END@
gtk_extra_sources = \
gtkversion.h.in \
gtkmarshalers.list \
gtkmarshal.list
#
# setup GTK+ sources and their dependancies
@ -463,63 +458,40 @@ EXTRA_DIST += $(gtk_built_sources)
gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
CLEANFILES = $(gen_sources)
## automake 1.5 supports this without $(OBJECTS): $(gtk_built_sources) hack
#BUILT_SOURCES = $(gtk_built_sources)
$(libgtk_x11_2_0_la_OBJECTS) $(libgtk_linux_fb_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_OBJECTS): ${gtk_built_public_sources} ${gtk_built_private_headers}
BUILT_SOURCES = $(gtk_built_sources)
# all autogenerated files need to be generated in the srcdir,
# so old versions get remade and are not confused with newer
# versions in the build dir. thus a development setup requires
# srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules.
$(srcdir)/gtkmarshalers.h: stamp-gtkmarshalers.h
gtkmarshalers.h: stamp-gtkmarshalers.h
@true
stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmlh \
&& (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
&& rm -f xgen-gmlh \
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header >> xgen-gmlh \
&& (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
&& rm -f xgen-gmlh \
&& echo timestamp > $(@F)
$(srcdir)/gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmlc \
&& cp xgen-gmlc gtkmarshalers.c \
gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body >> xgen-gmlc \
&& cp xgen-gmlc gtkmarshalers.c \
&& rm -f xgen-gmlc
$(srcdir)/gtkmarshal.h: stamp-gtkmarshal.h
gtkmarshal.h: stamp-gtkmarshal.h
@true
stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
&& echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \
&& (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
&& rm -f xgen-gmh \
echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh \
&& $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --header >> xgen-gmh \
&& echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \
&& (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
&& rm -f xgen-gmh \
&& echo timestamp > $(@F)
$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc gtkmarshal.c \
gtkmarshal.c: @REBUILD@ gtkmarshal.list
$(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc gtkmarshal.c \
&& rm -f xgen-gmc
$(srcdir)/gtktypebuiltins.h: stamp-gtktypebuiltins.h
gtktypebuiltins.h: stamp-gtktypebuiltins.h
@true
stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \
@ -528,10 +500,10 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
--vhead "GType @enum_name@_get_type (void);\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \
$(gtk_public_h_sources) ) >> xgen-gtbh \
&& (cmp -s xgen-gtbh $(srcdir)/gtktypebuiltins.h || cp xgen-gtbh $(srcdir)/gtktypebuiltins.h ) \
&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
&& rm -f xgen-gtbh \
&& echo timestamp > $(@F)
$(srcdir)/gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
@ -539,7 +511,7 @@ $(srcdir)/gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$(gtk_public_h_sources) ) > xgen-gtbc \
&& cp xgen-gtbc $(srcdir)/gtktypebuiltins.c \
&& cp xgen-gtbc gtktypebuiltins.c \
&& rm -f xgen-gtbc
# target platform:
@ -552,7 +524,13 @@ libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) $(gtk_plug_c_sources)
libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
libgtk_win32_2_0_la_LIBADD = $(gtk_win32res_lo)
libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
libgtk_x11_2_0_la_LIBADD = $(libadd)
libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
libgtk_win32_2_0_la_LIBADD = $(libadd) $(gtk_win32res_lo)
libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
if USE_WIN32
@ -579,15 +557,21 @@ uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
distclean-local:
if test $(srcdir) != .; then \
rm -f $(MAINTAINERCLEANFILES); \
fi
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
TEST_DEPS = $(DEPS) gtk.immodules
LDADDS = @STRIP_BEGIN@ \
LDADDS = \
$(gtktargetlib) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
@STRIP_END@
$(top_builddir)/gdk/$(gdktargetlib)
#
# Installed tools
@ -606,7 +590,7 @@ files:
echo $$p; \
done
EXTRA_DIST += @STRIP_BEGIN@ \
EXTRA_DIST += \
line-arrow.xbm \
line-wrap.xbm \
tree_plus.xbm \
@ -620,8 +604,7 @@ EXTRA_DIST += @STRIP_BEGIN@ \
gtkrc.key.default \
gtkrc.key.emacs \
makefile.msc \
makefile.msc.in \
@STRIP_END@
makefile.msc.in
install-data-local:

305
gtk/stock-icons/Makefile.am
View File

@ -1,5 +1,5 @@
IMAGES = @STRIP_BEGIN@ \
IMAGES = \
stock_add_16.png \
stock_add_24.png \
stock_align_center_16.png \
@ -121,144 +121,137 @@ IMAGES = @STRIP_BEGIN@ \
stock_zoom_1_24.png \
stock_zoom_fit_24.png \
stock_zoom_in_24.png \
stock_zoom_out_24.png \
@STRIP_END@
stock_zoom_out_24.png
VARIABLES1 = @STRIP_BEGIN@ \
stock_add_16 $(srcdir)/stock_add_16.png \
stock_add_24 $(srcdir)/stock_add_24.png \
stock_align_center_16 $(srcdir)/stock_align_center_16.png \
stock_align_center_24 $(srcdir)/stock_align_center_24.png \
stock_align_justify_16 $(srcdir)/stock_align_justify_16.png \
stock_align_justify_24 $(srcdir)/stock_align_justify_24.png \
stock_align_left_16 $(srcdir)/stock_align_left_16.png \
stock_align_left_24 $(srcdir)/stock_align_left_24.png \
stock_align_right_16 $(srcdir)/stock_align_right_16.png \
stock_align_right_24 $(srcdir)/stock_align_right_24.png \
stock_apply_20 $(srcdir)/stock_apply_20.png \
stock_cancel_20 $(srcdir)/stock_cancel_20.png \
stock_dnd_multiple_32 $(srcdir)/stock_dnd_multiple_32.png \
stock_bottom_16 $(srcdir)/stock_bottom_16.png \
stock_bottom_24 $(srcdir)/stock_bottom_24.png \
stock_cdrom_16 $(srcdir)/stock_cdrom_16.png \
stock_cdrom_24 $(srcdir)/stock_cdrom_24.png \
stock_clear_24 $(srcdir)/stock_clear_24.png \
stock_close_20 $(srcdir)/stock_close_20.png \
stock_close_24 $(srcdir)/stock_close_24.png \
stock_colorselector_24 $(srcdir)/stock_colorselector_24.png \
stock_color_picker_25 $(srcdir)/stock_color_picker_25.png \
@STRIP_END@
VARIABLES2 = @STRIP_BEGIN@ \
stock_convert_16 $(srcdir)/stock_convert_16.png \
stock_convert_24 $(srcdir)/stock_convert_24.png \
stock_copy_16 $(srcdir)/stock_copy_16.png \
stock_copy_24 $(srcdir)/stock_copy_24.png \
stock_cut_16 $(srcdir)/stock_cut_16.png \
stock_cut_24 $(srcdir)/stock_cut_24.png \
stock_dialog_error_48 $(srcdir)/stock_dialog_error_48.png \
stock_dialog_info_48 $(srcdir)/stock_dialog_info_48.png \
stock_dialog_question_48 $(srcdir)/stock_dialog_question_48.png \
stock_dialog_warning_48 $(srcdir)/stock_dialog_warning_48.png \
stock_dnd_32 $(srcdir)/stock_dnd_32.png \
stock_down_arrow_16 $(srcdir)/stock_down_arrow_16.png \
stock_down_arrow_24 $(srcdir)/stock_down_arrow_24.png \
stock_exec_16 $(srcdir)/stock_exec_16.png \
stock_exec_24 $(srcdir)/stock_exec_24.png \
stock_exit_16 $(srcdir)/stock_exit_16.png \
stock_exit_24 $(srcdir)/stock_exit_24.png \
stock_first_16 $(srcdir)/stock_first_16.png \
stock_first_24 $(srcdir)/stock_first_24.png \
stock_font_16 $(srcdir)/stock_font_16.png \
@STRIP_END@
VARIABLES3 = @STRIP_BEGIN@ \
stock_font_24 $(srcdir)/stock_font_24.png \
stock_help_16 $(srcdir)/stock_help_16.png \
stock_help_24 $(srcdir)/stock_help_24.png \
stock_home_16 $(srcdir)/stock_home_16.png \
stock_home_24 $(srcdir)/stock_home_24.png \
stock_index_24 $(srcdir)/stock_index_24.png \
stock_jump_to_16 $(srcdir)/stock_jump_to_16.png \
stock_jump_to_24 $(srcdir)/stock_jump_to_24.png \
stock_jump_to_rtl_16 $(srcdir)/stock_jump_to_rtl_16.png \
stock_jump_to_rtl_24 $(srcdir)/stock_jump_to_rtl_24.png \
stock_last_16 $(srcdir)/stock_last_16.png \
stock_last_24 $(srcdir)/stock_last_24.png \
stock_left_arrow_16 $(srcdir)/stock_left_arrow_16.png \
stock_left_arrow_24 $(srcdir)/stock_left_arrow_24.png \
stock_missing_image_16 $(srcdir)/stock_broken_image_16.png \
stock_missing_image_24 $(srcdir)/stock_broken_image_24.png \
stock_new_16 $(srcdir)/stock_new_16.png \
stock_new_24 $(srcdir)/stock_new_24.png \
stock_no_20 $(srcdir)/stock_no_20.png \
stock_ok_20 $(srcdir)/stock_ok_20.png \
stock_open_16 $(srcdir)/stock_open_16.png \
stock_open_24 $(srcdir)/stock_open_24.png \
@STRIP_END@
VARIABLES4 = @STRIP_BEGIN@ \
stock_paste_16 $(srcdir)/stock_paste_16.png \
stock_paste_24 $(srcdir)/stock_paste_24.png \
stock_preferences_16 $(srcdir)/stock_preferences_16.png \
stock_preferences_24 $(srcdir)/stock_preferences_24.png \
stock_print_16 $(srcdir)/stock_print_16.png \
stock_print_24 $(srcdir)/stock_print_24.png \
stock_print_preview_16 $(srcdir)/stock_print_preview_16.png \
stock_print_preview_24 $(srcdir)/stock_print_preview_24.png \
stock_properties_16 $(srcdir)/stock_properties_16.png \
stock_properties_24 $(srcdir)/stock_properties_24.png \
stock_redo_16 $(srcdir)/stock_redo_16.png \
stock_redo_24 $(srcdir)/stock_redo_24.png \
stock_refresh_16 $(srcdir)/stock_refresh_16.png \
stock_refresh_24 $(srcdir)/stock_refresh_24.png \
stock_remove_16 $(srcdir)/stock_remove_16.png \
stock_remove_24 $(srcdir)/stock_remove_24.png \
stock_revert_16 $(srcdir)/stock_revert_16.png \
stock_revert_24 $(srcdir)/stock_revert_24.png \
stock_right_arrow_16 $(srcdir)/stock_right_arrow_16.png \
stock_right_arrow_24 $(srcdir)/stock_right_arrow_24.png \
stock_save_16 $(srcdir)/stock_save_16.png \
@STRIP_END@
VARIABLES5 = @STRIP_BEGIN@ \
stock_save_24 $(srcdir)/stock_save_24.png \
stock_save_as_16 $(srcdir)/stock_save_as_16.png \
stock_save_as_24 $(srcdir)/stock_save_as_24.png \
stock_search_16 $(srcdir)/stock_search_16.png \
stock_search_24 $(srcdir)/stock_search_24.png \
stock_search_replace_16 $(srcdir)/stock_search_replace_16.png \
stock_search_replace_24 $(srcdir)/stock_search_replace_24.png \
stock_sort_ascending_16 $(srcdir)/stock_sort_ascending_16.png \
stock_sort_ascending_24 $(srcdir)/stock_sort_ascending_24.png \
stock_sort_descending_16 $(srcdir)/stock_sort_descending_16.png \
stock_sort_descending_24 $(srcdir)/stock_sort_descending_24.png \
stock_spellcheck_16 $(srcdir)/stock_spellcheck_16.png \
stock_spellcheck_24 $(srcdir)/stock_spellcheck_24.png \
stock_stop_16 $(srcdir)/stock_stop_16.png \
stock_stop_24 $(srcdir)/stock_stop_24.png \
stock_text_bold_16 $(srcdir)/stock_text_bold_16.png \
stock_text_bold_24 $(srcdir)/stock_text_bold_24.png \
stock_text_italic_16 $(srcdir)/stock_text_italic_16.png \
stock_text_italic_24 $(srcdir)/stock_text_italic_24.png \
stock_text_strikethrough_16 $(srcdir)/stock_text_strikethrough_16.png \
@STRIP_END@
VARIABLES6 = @STRIP_BEGIN@ \
stock_text_strikethrough_24 $(srcdir)/stock_text_strikethrough_24.png \
stock_text_underline_16 $(srcdir)/stock_text_underline_16.png \
stock_text_underline_24 $(srcdir)/stock_text_underline_24.png \
stock_top_16 $(srcdir)/stock_top_16.png \
stock_top_24 $(srcdir)/stock_top_24.png \
stock_trash_16 $(srcdir)/stock_trash_16.png \
stock_trash_24 $(srcdir)/stock_trash_24.png \
stock_undelete_16 $(srcdir)/stock_undelete_16.png \
stock_undelete_24 $(srcdir)/stock_undelete_24.png \
stock_undo_16 $(srcdir)/stock_undo_16.png \
stock_undo_24 $(srcdir)/stock_undo_24.png \
stock_up_arrow_16 $(srcdir)/stock_up_arrow_16.png \
stock_up_arrow_24 $(srcdir)/stock_up_arrow_24.png \
stock_yes_20 $(srcdir)/stock_yes_20.png \
stock_zoom_1_24 $(srcdir)/stock_zoom_1_24.png \
stock_zoom_fit_24 $(srcdir)/stock_zoom_fit_24.png \
stock_zoom_in_24 $(srcdir)/stock_zoom_in_24.png \
stock_zoom_out_24 $(srcdir)/stock_zoom_out_24.png \
@STRIP_END@
VARIABLES1 = \
stock_add_16 $(srcdir)/stock_add_16.png \
stock_add_24 $(srcdir)/stock_add_24.png \
stock_align_center_16 $(srcdir)/stock_align_center_16.png \
stock_align_center_24 $(srcdir)/stock_align_center_24.png \
stock_align_justify_16 $(srcdir)/stock_align_justify_16.png \
stock_align_justify_24 $(srcdir)/stock_align_justify_24.png \
stock_align_left_16 $(srcdir)/stock_align_left_16.png \
stock_align_left_24 $(srcdir)/stock_align_left_24.png \
stock_align_right_16 $(srcdir)/stock_align_right_16.png \
stock_align_right_24 $(srcdir)/stock_align_right_24.png \
stock_apply_20 $(srcdir)/stock_apply_20.png \
stock_cancel_20 $(srcdir)/stock_cancel_20.png \
stock_dnd_multiple_32 $(srcdir)/stock_dnd_multiple_32.png \
stock_bottom_16 $(srcdir)/stock_bottom_16.png \
stock_bottom_24 $(srcdir)/stock_bottom_24.png \
stock_cdrom_16 $(srcdir)/stock_cdrom_16.png \
stock_cdrom_24 $(srcdir)/stock_cdrom_24.png \
stock_clear_24 $(srcdir)/stock_clear_24.png \
stock_close_20 $(srcdir)/stock_close_20.png \
stock_close_24 $(srcdir)/stock_close_24.png \
stock_colorselector_24 $(srcdir)/stock_colorselector_24.png \
stock_color_picker_25 $(srcdir)/stock_color_picker_25.png
VARIABLES2 = \
stock_convert_16 $(srcdir)/stock_convert_16.png \
stock_convert_24 $(srcdir)/stock_convert_24.png \
stock_copy_16 $(srcdir)/stock_copy_16.png \
stock_copy_24 $(srcdir)/stock_copy_24.png \
stock_cut_16 $(srcdir)/stock_cut_16.png \
stock_cut_24 $(srcdir)/stock_cut_24.png \
stock_dialog_error_48 $(srcdir)/stock_dialog_error_48.png \
stock_dialog_info_48 $(srcdir)/stock_dialog_info_48.png \
stock_dialog_question_48 $(srcdir)/stock_dialog_question_48.png \
stock_dialog_warning_48 $(srcdir)/stock_dialog_warning_48.png \
stock_dnd_32 $(srcdir)/stock_dnd_32.png \
stock_down_arrow_16 $(srcdir)/stock_down_arrow_16.png \
stock_down_arrow_24 $(srcdir)/stock_down_arrow_24.png \
stock_exec_16 $(srcdir)/stock_exec_16.png \
stock_exec_24 $(srcdir)/stock_exec_24.png \
stock_exit_16 $(srcdir)/stock_exit_16.png \
stock_exit_24 $(srcdir)/stock_exit_24.png \
stock_first_16 $(srcdir)/stock_first_16.png \
stock_first_24 $(srcdir)/stock_first_24.png \
stock_font_16 $(srcdir)/stock_font_16.png
VARIABLES3 = \
stock_font_24 $(srcdir)/stock_font_24.png \
stock_help_16 $(srcdir)/stock_help_16.png \
stock_help_24 $(srcdir)/stock_help_24.png \
stock_home_16 $(srcdir)/stock_home_16.png \
stock_home_24 $(srcdir)/stock_home_24.png \
stock_index_24 $(srcdir)/stock_index_24.png \
stock_jump_to_16 $(srcdir)/stock_jump_to_16.png \
stock_jump_to_24 $(srcdir)/stock_jump_to_24.png \
stock_jump_to_rtl_16 $(srcdir)/stock_jump_to_rtl_16.png \
stock_jump_to_rtl_24 $(srcdir)/stock_jump_to_rtl_24.png \
stock_last_16 $(srcdir)/stock_last_16.png \
stock_last_24 $(srcdir)/stock_last_24.png \
stock_left_arrow_16 $(srcdir)/stock_left_arrow_16.png \
stock_left_arrow_24 $(srcdir)/stock_left_arrow_24.png \
stock_missing_image_16 $(srcdir)/stock_broken_image_16.png \
stock_missing_image_24 $(srcdir)/stock_broken_image_24.png \
stock_new_16 $(srcdir)/stock_new_16.png \
stock_new_24 $(srcdir)/stock_new_24.png \
stock_no_20 $(srcdir)/stock_no_20.png \
stock_ok_20 $(srcdir)/stock_ok_20.png \
stock_open_16 $(srcdir)/stock_open_16.png \
stock_open_24 $(srcdir)/stock_open_24.png
VARIABLES4 = \
stock_paste_16 $(srcdir)/stock_paste_16.png \
stock_paste_24 $(srcdir)/stock_paste_24.png \
stock_preferences_16 $(srcdir)/stock_preferences_16.png \
stock_preferences_24 $(srcdir)/stock_preferences_24.png \
stock_print_16 $(srcdir)/stock_print_16.png \
stock_print_24 $(srcdir)/stock_print_24.png \
stock_print_preview_16 $(srcdir)/stock_print_preview_16.png \
stock_print_preview_24 $(srcdir)/stock_print_preview_24.png \
stock_properties_16 $(srcdir)/stock_properties_16.png \
stock_properties_24 $(srcdir)/stock_properties_24.png \
stock_redo_16 $(srcdir)/stock_redo_16.png \
stock_redo_24 $(srcdir)/stock_redo_24.png \
stock_refresh_16 $(srcdir)/stock_refresh_16.png \
stock_refresh_24 $(srcdir)/stock_refresh_24.png \
stock_remove_16 $(srcdir)/stock_remove_16.png \
stock_remove_24 $(srcdir)/stock_remove_24.png \
stock_revert_16 $(srcdir)/stock_revert_16.png \
stock_revert_24 $(srcdir)/stock_revert_24.png \
stock_right_arrow_16 $(srcdir)/stock_right_arrow_16.png \
stock_right_arrow_24 $(srcdir)/stock_right_arrow_24.png \
stock_save_16 $(srcdir)/stock_save_16.png
VARIABLES5 = \
stock_save_24 $(srcdir)/stock_save_24.png \
stock_save_as_16 $(srcdir)/stock_save_as_16.png \
stock_save_as_24 $(srcdir)/stock_save_as_24.png \
stock_search_16 $(srcdir)/stock_search_16.png \
stock_search_24 $(srcdir)/stock_search_24.png \
stock_search_replace_16 $(srcdir)/stock_search_replace_16.png \
stock_search_replace_24 $(srcdir)/stock_search_replace_24.png \
stock_sort_ascending_16 $(srcdir)/stock_sort_ascending_16.png \
stock_sort_ascending_24 $(srcdir)/stock_sort_ascending_24.png \
stock_sort_descending_16 $(srcdir)/stock_sort_descending_16.png \
stock_sort_descending_24 $(srcdir)/stock_sort_descending_24.png \
stock_spellcheck_16 $(srcdir)/stock_spellcheck_16.png \
stock_spellcheck_24 $(srcdir)/stock_spellcheck_24.png \
stock_stop_16 $(srcdir)/stock_stop_16.png \
stock_stop_24 $(srcdir)/stock_stop_24.png \
stock_text_bold_16 $(srcdir)/stock_text_bold_16.png \
stock_text_bold_24 $(srcdir)/stock_text_bold_24.png \
stock_text_italic_16 $(srcdir)/stock_text_italic_16.png \
stock_text_italic_24 $(srcdir)/stock_text_italic_24.png \
stock_text_strikethrough_16 $(srcdir)/stock_text_strikethrough_16.png
VARIABLES6 = \
stock_text_strikethrough_24 $(srcdir)/stock_text_strikethrough_24.png \
stock_text_underline_16 $(srcdir)/stock_text_underline_16.png \
stock_text_underline_24 $(srcdir)/stock_text_underline_24.png \
stock_top_16 $(srcdir)/stock_top_16.png \
stock_top_24 $(srcdir)/stock_top_24.png \
stock_trash_16 $(srcdir)/stock_trash_16.png \
stock_trash_24 $(srcdir)/stock_trash_24.png \
stock_undelete_16 $(srcdir)/stock_undelete_16.png \
stock_undelete_24 $(srcdir)/stock_undelete_24.png \
stock_undo_16 $(srcdir)/stock_undo_16.png \
stock_undo_24 $(srcdir)/stock_undo_24.png \
stock_up_arrow_16 $(srcdir)/stock_up_arrow_16.png \
stock_up_arrow_24 $(srcdir)/stock_up_arrow_24.png \
stock_yes_20 $(srcdir)/stock_yes_20.png \
stock_zoom_1_24 $(srcdir)/stock_zoom_1_24.png \
stock_zoom_fit_24 $(srcdir)/stock_zoom_fit_24.png \
stock_zoom_in_24 $(srcdir)/stock_zoom_in_24.png \
stock_zoom_out_24 $(srcdir)/stock_zoom_out_24.png
noinst_DATA = gtkstockpixbufs.h
CLEANFILES = $(noinst_DATA)
@ -270,23 +263,23 @@ pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.load
endif
gtkstockpixbufs.h: @REBUILD_PNGS@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
$(pixbuf_csource) \
--raw --build-list $(VARIABLES1) > $(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES1) > gtkstockpixbufs.h || \
( rm -f gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES2) >> gtkstockpixbufs.h || \
( rm -f gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES3) >> gtkstockpixbufs.h || \
( rm -f gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES4) >> gtkstockpixbufs.h || \
( rm -f gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES5) >> gtkstockpixbufs.h || \
( rm -f gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES6) >> gtkstockpixbufs.h || \
( rm -f gtkstockpixbufs.h && false )
EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h

2
gtk/theme-bits/Makefile.am
View File

@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GDK_PIXBUF_DEP_CFLAGS@
$(GDK_PIXBUF_DEP_CFLAGS)
noinst_PROGRAMS = decompose-bits

27
modules/input/Makefile.am
View File

@ -4,7 +4,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined
endif
INCLUDES = @STRIP_BEGIN@ \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@ -12,22 +12,20 @@ INCLUDES = @STRIP_BEGIN@ \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
$(GTK_DEBUG_FLAGS) \
$(GTK_XIM_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = @STRIP_BEGIN@ \
LDADDS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@GTK_DEP_LIBS@ \
@STRIP_END@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
@ -100,6 +98,9 @@ install-data-local:
echo "***" ; \
fi
uninstall-local:
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
im-am-et.la \
@ -115,6 +116,8 @@ module_LTLIBRARIES = \
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
$(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules
CLEANFILES = gtk.immodules
if CROSS_COMPILING
else
all-local: gtk.immodules

41
tests/Makefile.am
View File

@ -1,27 +1,25 @@
## Makefile.am for gtk+/tests
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = @STRIP_BEGIN@ \
LDADDS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@STRIP_END@
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
if USE_X11
testsocket_programs = testsocket testsocket_child
@ -128,7 +126,7 @@ testsocket_child_SOURCES = \
testsocket_child.c \
testsocket_common.c
EXTRA_DIST = @STRIP_BEGIN@ \
EXTRA_DIST = \
prop-editor.h \
testgtk.1 \
testgtkrc \
@ -143,7 +141,4 @@ EXTRA_DIST = @STRIP_BEGIN@ \
test.xpm \
check-y.xpm \
check-n.xpm \
test.xpm \
@STRIP_END@
test.xpm