Commit 486362db authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Update to libtool-1.2b, change library versioning scheme to drop

Tue Sep 15 14:57:30 1998  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
	change library versioning scheme to drop LT_RELEASE
	from the -l line, while keeping it in the soname.

Tue Sep 15 14:10:33 1998  Owen Taylor  <otaylor@redhat.com>

	* configure.in Makefile.in: define a MAINT-like variable REBUILD
	which is set if Perl and awk are found, and autogenerated sources
	can be rebuilt. Remove the auto-generated sources from
	CVS.

	Add dependencies so that the autogenerated sources are
	rebuilt if the files they depend on change.
	(This unfortunately currently results in the entire
	gtk/ directory being rebuilt when any header changes.
	Moving all enums to gtkenums.h would fix this.)
parent ee1b9618
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and * gtk/gtkobject.h: added gtk_object_set_data_destroy and
...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> ...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the -- the widget argument is NULL for the first radio button in the
group. group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes * gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and * gtk/gtkobject.h: added gtk_object_set_data_destroy and
...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> ...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the -- the widget argument is NULL for the first radio button in the
group. group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes * gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and * gtk/gtkobject.h: added gtk_object_set_data_destroy and
...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> ...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the -- the widget argument is NULL for the first radio button in the
group. group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes * gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and * gtk/gtkobject.h: added gtk_object_set_data_destroy and
...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> ...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the -- the widget argument is NULL for the first radio button in the
group. group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes * gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and * gtk/gtkobject.h: added gtk_object_set_data_destroy and
...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> ...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the -- the widget argument is NULL for the first radio button in the
group. group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes * gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and * gtk/gtkobject.h: added gtk_object_set_data_destroy and
...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> ...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the -- the widget argument is NULL for the first radio button in the
group. group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes * gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and * gtk/gtkobject.h: added gtk_object_set_data_destroy and
...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org> ...@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the -- the widget argument is NULL for the first radio button in the
group. group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes * gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. # Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
# #
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
...@@ -478,10 +478,10 @@ EOF ...@@ -478,10 +478,10 @@ EOF
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;; exit 0 ;;
i*:CYGWIN*:*) i*:CYGWIN*:*)
echo i386-pc-cygwin32 echo ${UNAME_MACHINE}-pc-cygwin32
exit 0 ;; exit 0 ;;
i*:MINGW*:*) i*:MINGW*:*)
echo i386-pc-mingw32 echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;; exit 0 ;;
p*:CYGWIN*:*) p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin32 echo powerpcle-unknown-cygwin32
...@@ -493,6 +493,12 @@ EOF ...@@ -493,6 +493,12 @@ EOF
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;; exit 0 ;;
*:Linux:*:*) *:Linux:*:*)
# uname on the ARM produces all sorts of strangeness, and we need to
# filter it out.
case "$UNAME_MACHINE" in
arm* | sa110*) UNAME_MACHINE="arm" ;;
esac
# The BFD linker knows what the default object file format is, so # The BFD linker knows what the default object file format is, so
# first see if it will tell us. # first see if it will tell us.
ld_help_string=`ld --help 2>&1` ld_help_string=`ld --help 2>&1`
...@@ -506,6 +512,7 @@ EOF ...@@ -506,6 +512,7 @@ EOF
i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
esac esac
......
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script, version 1.1. # Configuration validation subroutine script, version 1.1.
# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. # Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can. # can handle that machine. It does not imply ALL GNU software can.
...@@ -162,7 +162,7 @@ case $basic_machine in ...@@ -162,7 +162,7 @@ case $basic_machine in
# We use `pc' rather than `unknown' # We use `pc' rather than `unknown'
# because (1) that's what they normally are, and # because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users. # (2) the word "unknown" tends to confuse beginning users.
i[3456]86) i[34567]86)
basic_machine=$basic_machine-pc basic_machine=$basic_machine-pc
;; ;;
# Object if more than one company name word. # Object if more than one company name word.
...@@ -171,7 +171,7 @@ case $basic_machine in ...@@ -171,7 +171,7 @@ case $basic_machine in
exit 1 exit 1
;; ;;
# Recognize the basic CPU types with company name. # Recognize the basic CPU types with company name.
vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
...@@ -350,19 +350,19 @@ case $basic_machine in ...@@ -350,19 +350,19 @@ case $basic_machine in
os=-mvs os=-mvs
;; ;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2? # I'm not sure what "Sysv32" means. Should this be sysv3.2?
i[3456]86v32) i[34567]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32 os=-sysv32
;; ;;
i[3456]86v4*) i[34567]86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4 os=-sysv4
;; ;;
i[3456]86v) i[34567]86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv os=-sysv
;; ;;
i[3456]86sol2) i[34567]86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2 os=-solaris2
;; ;;
...@@ -469,25 +469,23 @@ case $basic_machine in ...@@ -469,25 +469,23 @@ case $basic_machine in
pc532 | pc532-*) pc532 | pc532-*)
basic_machine=ns32k-pc532 basic_machine=ns32k-pc532
;; ;;
pentium | p5) pentium | p5 | k5 | nexen)
basic_machine=i586-intel basic_machine=i586-pc
;; ;;
pentiumpro | p6) pentiumpro | p6 | k6 | 6x86)
basic_machine=i686-intel basic_machine=i686-pc
;; ;;
pentium-* | p5-*) pentiumii | pentium2)
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | nexen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
pentiumpro-* | p6-*) pentiumpro-* | p6-* | k6-* | 6x86-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
k5) pentiumii-* | pentium2-*)
# We don't have specific support for AMD's K5 yet, so just call it a Pentium basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=i586-amd
;;
nexen)
# We don't have specific support for Nexgen yet, so just call it a Pentium
basic_machine=i586-nexgen
;; ;;
pn) pn)
basic_machine=pn-gould basic_machine=pn-gould
......
...@@ -107,8 +107,24 @@ if test "x$GCC" = "xyes"; then ...@@ -107,8 +107,24 @@ if test "x$GCC" = "xyes"; then
fi fi
fi fi
dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R) # define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
AC_PROG_AWK
AC_CHECK_PROGS(PERL, perl5 perl)
REBUILD=\#
if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
if test -n "$AWK" ; then
REBUILD=
fi
fi
AC_SUBST(REBUILD)
dnl The DU4 header files don't provide library prototypes unless
dnl -std1 is given to the native cc.
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
gtk_save_LIBS=$LIBS gtk_save_LIBS=$LIBS
LIBS="$LIBS -lm" LIBS="$LIBS -lm"
AC_TRY_RUN([#include <math.h> AC_TRY_RUN([#include <math.h>
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
gdkincludedir = $(includedir)/gdk gdkincludedir = $(includedir)/gdk
lib_LTLIBRARIES = libgdk-1.1.la lib_LTLIBRARIES = libgdk.la
DEFS += -DG_LOG_DOMAIN=\"Gdk\" DEFS += -DG_LOG_DOMAIN=\"Gdk\"
libgdk_1_1_la_SOURCES = \ libgdk_la_SOURCES = \
gdk.c \ gdk.c \
gdkcc.c \ gdkcc.c \
gdkcolor.c \ gdkcolor.c \
...@@ -50,9 +50,9 @@ gdkinclude_HEADERS = \ ...@@ -50,9 +50,9 @@ gdkinclude_HEADERS = \
gdktypes.h \ gdktypes.h \
gdkx.h gdkx.h
libgdk_1_1_la_LDFLAGS = \ libgdk_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
@x_ldflags@ @x_libs@ @x_ldflags@ @x_libs@
INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
......
...@@ -64,7 +64,7 @@ while test $# -gt 0; do ...@@ -64,7 +64,7 @@ while test $# -gt 0; do
fi fi
fi fi
done done
echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @x_libs@ -lm echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ -lm
;; ;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
gtkincludedir = $(includedir)/gtk gtkincludedir = $(includedir)/gtk
DEFS += -DG_LOG_DOMAIN=\"Gtk\" DEFS += -DG_LOG_DOMAIN=\"Gtk\"
lib_LTLIBRARIES = libgtk-1.1.la lib_LTLIBRARIES = libgtk.la
libgtk_1_1_la_SOURCES = \ libgtk_la_SOURCES = \
gtkaccelgroup.c \ gtkaccelgroup.c \
gtkaccellabel.c \ gtkaccellabel.c \
gtkadjustment.c \ gtkadjustment.c \
...@@ -107,7 +107,8 @@ libgtk_1_1_la_SOURCES = \ ...@@ -107,7 +107,8 @@ libgtk_1_1_la_SOURCES = \
fnmatch.c \ fnmatch.c \
fnmatch.h fnmatch.h
gtkinclude_HEADERS = \ # Source headers are are non-autogenerated headers
source_headers = \
gtk.h \ gtk.h \
gtkaccelgroup.h \ gtkaccelgroup.h \
gtkaccellabel.h \ gtkaccellabel.h \
...@@ -160,7 +161,6 @@ gtkinclude_HEADERS = \ ...@@ -160,7 +161,6 @@ gtkinclude_HEADERS = \
gtklist.h \ gtklist.h \
gtklistitem.h \ gtklistitem.h \
gtkmain.h \ gtkmain.h \
gtkmarshal.h \
gtkmenu.h \ gtkmenu.h \
gtkmenubar.h \ gtkmenubar.h \
gtkmenufactory.h \ gtkmenufactory.h \
...@@ -210,61 +210,71 @@ gtkinclude_HEADERS = \ ...@@ -210,61 +210,71 @@ gtkinclude_HEADERS = \
gtkvscrollbar.h \ gtkvscrollbar.h \
gtkvseparator.h \ gtkvseparator.h \
gtkwidget.h \ gtkwidget.h \
gtkwindow.h \ gtkwindow.h
gtkinclude_HEADERS = \
$(source_headers) \
gtkmarshal.h \
gtktypebuiltins.h gtktypebuiltins.h
.PHONY: auto-files auto-files-1 BUILT_SOURCES = \
auto-files: gtktypebuiltins.h \
rm -f $(srcdir)/gtk.defs gtktypebuiltins_evals.c \
$(MAKE) auto-files-1 gtktypebuiltins_ids.c \
gtktypebuiltins_vars.c \
gtkmarshal.c \
gtkmarshal.h
auto-files-1: gtk.defs # More headers to use when autogenerating.
auto-files-1: gtktypebuiltins_evals.c gtktypebuiltins_ids.c gdk_headers = \
auto-files-1: gtktypebuiltins_vars.c gtktypebuiltins.h $(top_srcdir)/gdk/gdktypes.h \
$(top_srcdir)/gdk/gdkrgb.h
# generate gtk.defs file from gtk-boxed.defs and *.h # generate gtk.defs file from gtk-boxed.defs and *.h
gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%` ; \
srcdir=$(srcdir) \ srcdir=$(srcdir) \
perl $(srcdir)/makeenums.pl defs $(srcdir)/gtk*.h \ perl $(srcdir)/makeenums.pl defs $$src_headers \
$(top_srcdir)/gdk/gdk*.h > gd.tmp $(gdk_headers) > gd.tmp
cat $(srcdir)/gtk-boxed.defs >> gd.tmp cat $(srcdir)/gtk-boxed.defs >> gd.tmp
cp gd.tmp $(srcdir)/gtk.defs cp gd.tmp $(srcdir)/gtk.defs
rm -f gd.tmp rm -f gd.tmp
# generate type identifier header (GTK_TYPE_WIDGET_FLAGS) # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
gtktypebuiltins.h: @MAINT@ gtk.defs maketypes.awk gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
cp gtb.tmp $(srcdir)/gtktypebuiltins.h cp gtb.tmp $(srcdir)/gtktypebuiltins.h
rm -f gtb.tmp rm -f gtb.tmp
# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS) # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
gtktypebuiltins_vars.c: @MAINT@ gtk.defs maketypes.awk gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
rm -f gtbv.tmp rm -f gtbv.tmp
# generate type entries for type-id registration # generate type entries for type-id registration