luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Default to --disable-gtk-doc, to avoid Jade setup hassles.

Browse Source 
Sun Mar  3 21:09:24 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Default to --disable-gtk-doc, to avoid
        Jade setup hassles.

        * autogen.sh: Add --enable-gtk-doc.

        * configure.in: Default to --disable-static to go
        along with Pango, GTK+ where we need to do that for
        bin-compat reasons.

        * Makefile.am: Add a slightly modified distcheck rule
        that passes --enable-gtk-doc to the configure inside.
        (So that 'make dist' succeeds inside.)

        * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
        tests/makefile.mingw.in: Switch everything over to
        glib-2.0.
This commit is contained in:
Owen Taylor 2002-03-05 05:18:23 +00:00 committed by Owen Taylor
parent f79770257f
commit fc8fd6f8cb
31 changed files with 274 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

19
ChangeLog.pre-2-0
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

19
ChangeLog.pre-2-10
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

19
ChangeLog.pre-2-12
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

19
ChangeLog.pre-2-2
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

19
ChangeLog.pre-2-4
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

19
ChangeLog.pre-2-6
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

19
ChangeLog.pre-2-8
View File

@ -1,3 +1,22 @@
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Sun Mar 3 02:30:05 2002 Tim Janik <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.

4
INSTALL
View File

@ -1,8 +1,8 @@
Simple install procedure
========================
% gzip -cd glib-1.3.15.tar.gz | tar xvf - # unpack the sources
% cd glib-1.3.15 # change to the toplevel directory
% gzip -cd glib-2.0.0.tar.gz | tar xvf - # unpack the sources
% cd glib-2.0.0 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GLIB

24
Makefile.am
View File

@ -102,3 +102,27 @@ dist-hook: $(BUILT_EXTRA_DIST)
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
rm -f $(distdir)/$$f && cp $$d/$$f $(distdir) || exit 1; done
# 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"

2
README
View File

@ -13,7 +13,7 @@ version is meant for developers of GLib only:
General Information
===================
This is GLib version 1.3.15. GLib is a library which includes support
This is GLib version 2.0.0. GLib is a library which includes support
routines for C such as lists, trees, hashes, memory allocation, and
many other things.

2
autogen.sh
View File

@ -86,7 +86,7 @@ autoconf
cd $ORIGDIR
if test -z "$AUTOGEN_SUBDIR_MODE"; then
$srcdir/configure --enable-maintainer-mode "$@"
$srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
echo
echo "Now type 'make' to compile $PROJECT."

11
configure.in
View File

@ -31,9 +31,9 @@ GLIB_AC_DIVERT_BEFORE_HELP([
# if backwards compatibility has been broken,
# set GLIB_BINARY_AGE _and_ GLIB_INTERFACE_AGE to 0.
#
GLIB_MAJOR_VERSION=1
GLIB_MINOR_VERSION=3
GLIB_MICRO_VERSION=15
GLIB_MAJOR_VERSION=2
GLIB_MINOR_VERSION=0
GLIB_MICRO_VERSION=0
GLIB_INTERFACE_AGE=0
GLIB_BINARY_AGE=0
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
@ -292,6 +292,7 @@ GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale"
AC_DEFINE_UNQUOTED(GLIB_LOCALE_DIR,"$GLIB_LOCALE_DIR")
dnl Initialize libtool
AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
@ -1613,9 +1614,9 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=no)
if test x$enable_gtk_doc = xauto ; then
if test x$enable_gtk_doc = xyes ; then
if test x$GTKDOC = xtrue ; then
enable_gtk_doc=yes
else

2
glib-2.0-uninstalled.pc.in
View File

@ -5,5 +5,5 @@ glib_mkenums=${pc_top_builddir}/${pcfiledir}/@srcdir@/gobject/glib-mkenums
Name: GLib Uninstalled
Description: C Utility Library, Not Installed
Version: @VERSION@
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-2.0.la @ICONV_LIBS@ @INTLLIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/glib

2
glib-2.0.pc.in
View File

@ -10,5 +10,5 @@ glib_mkenums=glib-mkenums
Name: GLib
Description: C Utility Library
Version: @VERSION@
Libs: -L${libdir} -lglib-1.3 @INTLLIBS@ @ICONV_LIBS@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include

24
glib-zip.in
View File

@ -12,10 +12,10 @@ rm $ZIP
zip -r $ZIP -@ <<EOF
COPYING.LIB-2
bin/gspawn-win32-helper.exe
lib/libglib-1.3-@LT_CURRENT_MINUS_AGE@.dll
lib/libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll
lib/libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll
lib/libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll
lib/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
lib/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
lib/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
lib/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
EOF
zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
@ -27,14 +27,14 @@ bin/glib-gettextize
bin/glib-mkenums
bin/gobject-query.exe
include/glib-2.0
lib/libglib-1.3.dll.a
lib/glib-1.3.lib
lib/libgmodule-1.3.dll.a
lib/gmodule-1.3.lib
lib/libgobject-1.3.dll.a
lib/gobject-1.3.lib
lib/libgthread-1.3.dll.a
lib/gthread-1.3.lib
lib/libglib-2.0.dll.a
lib/glib-2.0.lib
lib/libgmodule-2.0.dll.a
lib/gmodule-2.0.lib
lib/libgobject-2.0.dll.a
lib/gobject-2.0.lib
lib/libgthread-2.0.dll.a
lib/gthread-2.0.lib
lib/glib-2.0
lib/pkgconfig/glib-2.0.pc
lib/pkgconfig/gmodule-2.0.pc

2
glib.spec.in
View File

@ -4,7 +4,7 @@ Version: @VERSION@
Release: 1
License: LGPL
Group: Development/Libraries
Source: ftp://ftp.gimp.org/pub/gtk/v1.3/glib-%{version}.tar.gz
Source: ftp://ftp.gimp.org/pub/gtk/v2.0/glib-%{version}.tar.gz
BuildRoot: /var/tmp/%{name}-%{version}-root
URL: http://www.gtk.org

2
glib/.cvsignore
View File

@ -1,6 +1,6 @@
Makefile
Makefile.in
libglib-1.3.la
libglib-2.0.la
makefile.mingw
makefile.msc
glib.rc

28
glib/Makefile.am
View File

@ -18,22 +18,22 @@ BUILT_EXTRA_DIST = \
makefile.mingw \
glib.rc
lib_LTLIBRARIES = libglib-1.3.la
lib_LTLIBRARIES = libglib-2.0.la
if MS_LIB_AVAILABLE
noinst_DATA = glib-1.3.lib
noinst_DATA = glib-2.0.lib
install-ms-lib:
$(INSTALL) glib-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/glib-1.3.lib
-rm $(DESTDIR)$(libdir)/glib-2.0.lib
else
install-ms-lib:
uninstall-ms-lib:
endif
libglib_1_3_la_SOURCES = \
libglib_2_0_la_SOURCES = \
garray.c \
gasyncqueue.c \
gbacktrace.c \
@ -84,7 +84,7 @@ libglib_1_3_la_SOURCES = \
gutils.c \
gdebug.h
EXTRA_libglib_1_3_la_SOURCES = \
EXTRA_libglib_2_0_la_SOURCES = \
giounix.c \
giowin32.c \
gspawn.c \
@ -160,32 +160,32 @@ if OS_WIN32
export_symbols = -export-symbols glib.def
install-libtool-import-lib:
$(INSTALL) .libs/libglib-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libglib-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libglib-2.0.dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
libglib_1_3_la_LIBADD = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@
libglib_1_3_la_DEPENDENCIES = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
libglib_2_0_la_LIBADD = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
libglib_1_3_la_LDFLAGS = \
libglib_2_0_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols)
if OS_WIN32
bin_PROGRAMS = gspawn-win32-helper
gspawn_win32_helper_LDADD = libglib-1.3.la
gspawn_win32_helper_LDADD = libglib-2.0.la
gspawn_win32_helper_LDFLAGS = -mwindows
@G_LIB_WIN32_RESOURCE@ : glib.rc
$(top_srcdir)/build/win32/lt-compile-resource glib.rc @G_LIB_WIN32_RESOURCE@
endif
glib-1.3.lib: libglib-1.3.la glib.def
lib -name:libglib-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:glib.def -out:$@
glib-2.0.lib: libglib-2.0.la glib.def
lib -name:libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:glib.def -out:$@
glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib/glib.rc.in
cd $(top_builddir) && CONFIG_FILES=glib/$@ CONFIG_HEADERS= $(SHELL) ./config.status

2
gmodule-2.0-uninstalled.pc.in
View File

@ -4,5 +4,5 @@ Name: GModule Uninstalled
Description: Dynamic module loader for GLib, Not Installed
Requires: glib-2.0-uninstalled
Version: @VERSION@
Libs: @G_MODULE_LDFLAGS@ ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-1.3.la @G_MODULE_LIBS@
Libs: @G_MODULE_LDFLAGS@ ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la @G_MODULE_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule

2
gmodule-2.0.pc.in
View File

@ -9,5 +9,5 @@ Name: GModule
Description: Dynamic module loader for GLib
Requires: glib-2.0
Version: @VERSION@
Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@
Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@
Cflags:

26
gmodule/Makefile.am
View File

@ -29,20 +29,20 @@ glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \
gmodule.h
libglib = $(top_builddir)/glib/libglib-1.3.la
libglib = $(top_builddir)/glib/libglib-2.0.la
top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgmodule-1.3.la
lib_LTLIBRARIES = libgmodule-2.0.la
if MS_LIB_AVAILABLE
noinst_DATA = gmodule-1.3.lib
noinst_DATA = gmodule-2.0.lib
install-ms-lib:
$(INSTALL) gmodule-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gmodule-2.0.lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gmodule-1.3.lib
-rm $(DESTDIR)$(libdir)/gmodule-2.0.lib
else
install-ms-lib:
uninstall-ms-lib:
@ -56,31 +56,31 @@ if OS_WIN32
export_symbols = -export-symbols gmodule.def
install-libtool-import-lib:
$(INSTALL) .libs/libgmodule-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgmodule-2.0.dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgmodule-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgmodule-2.0.dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
libgmodule_1_3_la_SOURCES = gmodule.c
libgmodule_1_3_la_LDFLAGS = \
libgmodule_2_0_la_SOURCES = gmodule.c
libgmodule_2_0_la_LDFLAGS = \
@G_MODULE_LDFLAGS@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols)
libgmodule_1_3_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib)
libgmodule_2_0_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib)
libgmodule_1_3_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@
libgmodule_2_0_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@
if OS_WIN32
@G_MODULE_WIN32_RESOURCE@ : gmodule.rc
$(top_srcdir)/build/win32/lt-compile-resource gmodule.rc @G_MODULE_WIN32_RESOURCE@
endif
gmodule-1.3.lib: libgmodule-1.3.la gmodule.def
lib -name:libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@
gmodule-2.0.lib: libgmodule-2.0.la gmodule.def
lib -name:libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@
gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in
cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status

2
gobject-2.0-uninstalled.pc.in
View File

@ -2,6 +2,6 @@ Name: GObject Uninstalled
Description: Object/type system for GLib, Not Installed
Requires: glib-2.0-uninstalled
Version: @VERSION@
Libs: ${pc_top_builddir}/${pcfiledir}/gobject/libgobject-1.3.la
Libs: ${pc_top_builddir}/${pcfiledir}/gobject/libgobject-2.0.la
## cflags contains builddir in addition to srcdir because of gmarshal.h
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}

2
gobject-2.0.pc.in
View File

@ -7,5 +7,5 @@ Name: GObject
Description: GLib Type, Object, Parameter and Signal Library
Requires: glib-2.0
Version: @VERSION@
Libs: -L${libdir} -lgobject-1.3
Libs: -L${libdir} -lgobject-2.0
Cflags:

30
gobject/Makefile.am
View File

@ -13,19 +13,19 @@ INCLUDES = @STRIP_BEGIN@ \
-DG_DISABLE_CONST_RETURNS \
@STRIP_END@
libglib = $(top_builddir)/glib/libglib-1.3.la
libglib = $(top_builddir)/glib/libglib-2.0.la
# libraries to compile and install
lib_LTLIBRARIES = libgobject-1.3.la
lib_LTLIBRARIES = libgobject-2.0.la
if MS_LIB_AVAILABLE
noinst_DATA = gobject-1.3.lib
noinst_DATA = gobject-2.0.lib
install-ms-lib:
$(INSTALL) gobject-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gobject-2.0.lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gobject-1.3.lib
-rm $(DESTDIR)$(libdir)/gobject-2.0.lib
else
install-ms-lib:
uninstall-ms-lib:
@ -39,9 +39,9 @@ if OS_WIN32
export_symbols = -export-symbols gobject.def
install-libtool-import-lib:
$(INSTALL) .libs/libgobject-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgobject-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgobject-2.0.dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
@ -49,14 +49,14 @@ endif
# libtool stuff: set version and export symbols for resolving
libgobjectincludedir = $(includedir)/glib-2.0/gobject
libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
libgobject_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols) \
@STRIP_END@
libgobject_1_3_la_LIBADD = @G_OBJECT_WIN32_RESOURCE@ $(libglib)
libgobject_2_0_la_LIBADD = @G_OBJECT_WIN32_RESOURCE@ $(libglib)
libgobject_1_3_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@ @GOBJECT_DEF@
libgobject_2_0_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@ @GOBJECT_DEF@
#
# setup source file variables
@ -144,7 +144,7 @@ EXTRA_DIST += $(gobject_built_sources)
gen_sources = xgen-gmh xgen-gmc xgen-gms
CLEANFILES += $(gen_sources)
$(libgobject_1_3_la_OBJECTS): $(gobject_built_sources) ${gobject_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
$(libgobject_2_0_la_OBJECTS): $(gobject_built_sources) ${gobject_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
# initial creation of the real stamp-* files
gmarshal.h: # never add deps here
test -f "$(srcdir)/$@" || touch $(srcdir)/$@
@ -176,7 +176,7 @@ glib-genmarshal.o: gmarshal.strings
# target platform:
libgobjectinclude_HEADERS = $(gobject_target_headers)
libgobject_1_3_la_SOURCES = $(gobject_target_sources)
libgobject_2_0_la_SOURCES = $(gobject_target_sources)
#
# programs to compile and install
@ -190,7 +190,7 @@ glib_genmarshal_SOURCES = glib-genmarshal.c
testgobject_SOURCES = testgobject.c
testoverride_SOURCES = testoverride.c
# link programs against libgobject
progs_LDADD = ./libgobject-1.3.la $(libglib)
progs_LDADD = ./libgobject-2.0.la $(libglib)
glib_genmarshal_LDADD = $(libglib)
gobject_query_LDADD = $(progs_LDADD)
testgobject_LDADD = $(progs_LDADD)
@ -223,8 +223,8 @@ if OS_WIN32
$(top_srcdir)/build/win32/lt-compile-resource gobject.rc @G_OBJECT_WIN32_RESOURCE@
endif
gobject-1.3.lib: libgobject-1.3.la gobject.def
lib -name:libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gobject.def -out:$@
gobject-2.0.lib: libgobject-2.0.la gobject.def
lib -name:libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gobject.def -out:$@
gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in
cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status

2
gthread-2.0-uninstalled.pc.in
View File

@ -2,5 +2,5 @@ Name: GThread Uninstalled
Description: Thread support for GLib, Not Installed
Requires: glib-2.0-uninstalled
Version: @VERSION@
Libs: ${pc_top_builddir}/${pcfiledir}/gthread/libgthread-1.3.la @G_THREAD_LIBS@
Libs: ${pc_top_builddir}/${pcfiledir}/gthread/libgthread-2.0.la @G_THREAD_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @G_THREAD_CFLAGS@

2
gthread-2.0.pc.in
View File

@ -7,5 +7,5 @@ Name: GThread
Description: Thread support for GLib
Requires: glib-2.0
Version: @VERSION@
Libs: -L${libdir} -lgthread-1.3 @G_THREAD_LIBS@
Libs: -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@
Cflags: @G_THREAD_CFLAGS@

26
gthread/Makefile.am
View File

@ -19,20 +19,20 @@ BUILT_EXTRA_DIST = \
makefile.msc \
gthread.rc
libglib = $(top_builddir)/glib/libglib-1.3.la
libglib = $(top_builddir)/glib/libglib-2.0.la
top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgthread-1.3.la
lib_LTLIBRARIES = libgthread-2.0.la
if MS_LIB_AVAILABLE
noinst_DATA = gthread-1.3.lib
noinst_DATA = gthread-2.0.lib
install-ms-lib:
$(INSTALL) gthread-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gthread-2.0.lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gthread-1.3.lib
-rm $(DESTDIR)$(libdir)/gthread-2.0.lib
else
install-ms-lib:
uninstall-ms-lib:
@ -46,30 +46,30 @@ if OS_WIN32
export_symbols = -export-symbols gthread.def
install-libtool-import-lib:
$(INSTALL) .libs/libgthread-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgthread-2.0.dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgthread-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgthread-2.0.dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
libgthread_1_3_la_SOURCES = gthread-impl.c
libgthread_1_3_la_LDFLAGS = \
libgthread_2_0_la_SOURCES = gthread-impl.c
libgthread_2_0_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols)
libgthread_1_3_la_LIBADD = @G_THREAD_WIN32_RESOURCE@ @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
libgthread_2_0_la_LIBADD = @G_THREAD_WIN32_RESOURCE@ @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
libgthread_1_3_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ @GTHREAD_DEF@
libgthread_2_0_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ @GTHREAD_DEF@
if OS_WIN32
@G_THREAD_WIN32_RESOURCE@ : gthread.rc
$(top_srcdir)/build/win32/lt-compile-resource gthread.rc @G_THREAD_WIN32_RESOURCE@
endif
gthread-1.3.lib: libgthread-1.3.la gthread.def
lib -name:libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gthread.def -out:$@
gthread-2.0.lib: libgthread-2.0.la gthread.def
lib -name:libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gthread.def -out:$@
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status

2
m4macros/glib-2.0.m4
View File

@ -44,7 +44,7 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
no_glib=yes
fi
min_glib_version=ifelse([$1], ,1.3.3,$1)
min_glib_version=ifelse([$1], ,2.0.0,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
if test x$PKG_CONFIG != xno ; then

8
tests/Makefile.am
View File

@ -2,10 +2,10 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule @GLIB_DE
EFENCE=
libglib = $(top_builddir)/glib/libglib-1.3.la
libgthread = $(top_builddir)/gthread/libgthread-1.3.la
libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la
libgobject = $(top_builddir)/gobject/libgobject-1.3.la
libglib = $(top_builddir)/glib/libglib-2.0.la
libgthread = $(top_builddir)/gthread/libgthread-2.0.la
libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
libgobject = $(top_builddir)/gobject/libgobject-2.0.la
if PLATFORM_WIN32
libadd_libgmodule = $(libgmodule)

12
tests/makefile.mingw.in
View File

@ -56,20 +56,20 @@ all: $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
.SUFFIXES: .c .i .exe
.c.exe:
$(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-1.3 -L ../glib -lglib-1.3
$(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-2.0 -L ../glib -lglib-2.0
module-test.exe : module-test.o
$(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS)
$(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS)
$(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o
$(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS)
$(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS)
$(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o
$(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS)
$(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS)
libmoduletestplugin_a.dll : libmoduletestplugin_a.o
$(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3
$(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0
libmoduletestplugin_b.dll : libmoduletestplugin_b.o
$(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3
$(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0
check: all
@for P in $(TESTS) ; do echo $$P; PATH=../glib:../gmodule:../gobject:../gthread:$$PATH ./$$P; done