if HAVE_GOOD_PRINTF
else
-TRIO_SUBDIR = trio
+PRINTF_SUBDIR = gnulib
+printf_la = gnulib/libgnulib.la
endif
-SUBDIRS = libcharset $(TRIO_SUBDIR)
+SUBDIRS = libcharset $(PRINTF_SUBDIR)
-DIST_SUBDIRS = libcharset trio
+DIST_SUBDIRS = libcharset gnulib
INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \
- @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+ $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+
+glib.def: glib.symbols
+ (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def
+
+galias.h: glib.symbols
+ $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
+
+galiasdef.c: glib.symbols
+ $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
+
+if OS_LINUX
+if HAVE_GNUC_VISIBILITY
+TESTS = abicheck.sh
+endif
+endif
+
+BUILT_SOURCES = galias.h galiasdef.c
EXTRA_DIST = \
- makefile.mingw.in \
makefile.msc.in \
glib.rc.in \
gen-unicode-tables.pl \
- glib.def
+ makegalias.pl \
+ abicheck.sh \
+ glib.symbols
# These may be in the builddir too
BUILT_EXTRA_DIST = \
makefile.msc \
- makefile.mingw \
- glib.rc
+ glib.rc \
+ galias.h \
+ galiasdef.c
lib_LTLIBRARIES = libglib-2.0.la
libglib_2_0_la_SOURCES = \
garray.c \
gasyncqueue.c \
+ gatomic.c \
gbacktrace.c \
- gbsearcharray.c \
gbsearcharray.h \
gcache.c \
gcompletion.c \
gconvert.c \
gdataset.c \
+ gdatasetprivate.h \
gdate.c \
gdir.c \
gerror.c \
ghash.c \
ghook.c \
giochannel.c \
+ gkeyfile.c \
glibintl.h \
glist.c \
gmain.c \
+ gmappedfile.c \
gmarkup.c \
gmem.c \
gmessages.c \
gnode.c \
+ goption.c \
gpattern.c \
gprimes.c \
gqsort.c \
gscanner.c \
gshell.c \
gslist.c \
+ gstdio.c \
gstrfuncs.c \
gstring.c \
gthread.c \
+ gthreadinit.h \
gthreadpool.c \
gtimer.c \
gtree.c \
gunicomp.h \
gunidecomp.h \
gunidecomp.c \
+ gunicodeprivate.h \
gutils.c \
gdebug.h \
gprintf.c \
galloca.h \
garray.h \
gasyncqueue.h \
+ gatomic.h \
gbacktrace.h \
gcache.h \
gcompletion.h \
gfileutils.h \
ghash.h \
ghook.h \
+ gi18n.h \
+ gi18n-lib.h \
giochannel.h \
+ gkeyfile.h \
glist.h \
gmacros.h \
gmain.h \
+ gmappedfile.h \
gmarkup.h \
gmem.h \
gmessages.h \
gnode.h \
+ goption.h \
gpattern.h \
gprimes.h \
gqsort.h \
gshell.h \
gslist.h \
gspawn.h \
+ gstdio.h \
gstrfuncs.h \
gstring.h \
gthread.h \
gwin32.h \
gprintf.h
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
@if test -f $(glibincludedir)/glist.h ; then \
echo "*** Old headers found in $(glibincludedir). You should remove the" ; \
echo "*** contents of this directory and type 'make install' again." ; \
false ; \
fi
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: uninstall-ms-lib uninstall-def-file
if PLATFORM_WIN32
no_undefined = -no-undefined
# This requires a very new libtool
export_symbols = -export-symbols glib.def
-install-libtool-import-lib:
- $(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
- -rm $(DESTDIR)$(libdir)/libglib-2.0.dll.a
+install-def-file:
+ $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
+
+uninstall-def-file:
+ -rm $(DESTDIR)$(libdir)/glib-2.0.def
else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+install-def-file:
+uninstall-def-file:
+
+export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
endif
-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_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@
+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
libglib_2_0_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
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@
+$(G_LIB_WIN32_RESOURCE): glib.rc
+ $(top_srcdir)/build/win32/lt-compile-resource glib.rc $@
endif
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
-
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/glib/makefile.mingw.in
- cd $(top_builddir) && CONFIG_FILES=glib/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-makefile.msc: $(top_builddir)/config.status $(top_srcdir)/glib/makefile.msc.in
- cd $(top_builddir) && CONFIG_FILES=glib/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ lib -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \