printf_la = gnulib/libgnulib.la
endif
-SUBDIRS = libcharset $(PRINTF_SUBDIR)
+if ENABLE_REGEX
+if USE_SYSTEM_PCRE
+else
+MAYBE_PCRE = pcre
+endif
+gregex_c = gregex.c
+gregex_h = gregex.h
+else
+gregex_c =
+gregex_h =
+endif
+
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre
-DIST_SUBDIRS = libcharset gnulib
+DIST_SUBDIRS = libcharset gnulib pcre update-pcre
-INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \
- $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+INCLUDES = -I$(top_srcdir) $(pcre_inc) -DG_LOG_DOMAIN=\"GLib\" \
+ $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION \
+ -DPCRE_STATIC
glib.def: glib.symbols
- (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 $(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/\t/') > glib.def
+ (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
- $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
+ $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
-if OS_UNIX
-TESTS = abicheck.sh
+galiasdef.c: glib.symbols
+ $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
+
+if OS_LINUX
+if HAVE_GNUC_VISIBILITY
+TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
+TESTS = abicheck.sh pltcheck.sh
+endif
endif
-BUILT_SOURCES = galias.h
+BUILT_SOURCES = galias.h galiasdef.c
+MIRRORING_TAB_SOURCE = \
+ glib-mirroring-tab/Makefile \
+ glib-mirroring-tab/gen-mirroring-tab.c \
+ glib-mirroring-tab/packtab.h \
+ glib-mirroring-tab/packtab.c
+
+# The compilation of GRegex can be disabled, but the source files must
+# be distributed.
EXTRA_DIST = \
makefile.msc.in \
glib.rc.in \
gen-unicode-tables.pl \
+ gen-script-table.pl \
makegalias.pl \
abicheck.sh \
- glib.symbols
+ pltcheck.sh \
+ glib.symbols \
+ gregex.c \
+ gregex.h \
+ $(MIRRORING_TAB_SOURCE)
# These may be in the builddir too
BUILT_EXTRA_DIST = \
makefile.msc \
glib.rc \
- glib.def \
- galias.h
+ galias.h \
+ galiasdef.c
lib_LTLIBRARIES = libglib-2.0.la
gasyncqueue.c \
gatomic.c \
gbacktrace.c \
+ gbase64.c \
+ gbookmarkfile.c \
gbsearcharray.h \
gcache.c \
gcompletion.c \
gconvert.c \
gdataset.c \
+ gdatasetprivate.h \
gdate.c \
gdir.c \
gerror.c \
glibintl.h \
glist.c \
gmain.c \
+ gmappedfile.c \
gmarkup.c \
gmem.c \
gmessages.c \
+ gmirroringtable.h \
gnode.c \
goption.c \
gpattern.c \
gqueue.c \
grel.c \
grand.c \
+ $(gregex_c) \
gscanner.c \
+ gscripttable.h \
+ gsequence.c \
gshell.c \
+ gslice.c \
gslist.c \
+ gstdio.c \
gstrfuncs.c \
gstring.c \
+ gtestframework.c \
gthread.c \
- gthreadinit.h \
+ gthreadprivate.h \
gthreadpool.c \
gtimer.c \
gtree.c \
gasyncqueue.h \
gatomic.h \
gbacktrace.h \
+ gbase64.h \
+ gbookmarkfile.h \
gcache.h \
gcompletion.h \
gconvert.h \
glist.h \
gmacros.h \
gmain.h \
+ gmappedfile.h \
gmarkup.h \
gmem.h \
gmessages.h \
gquark.h \
gqueue.h \
grand.h \
+ $(gregex_h) \
grel.h \
gscanner.h \
+ gsequence.h \
gshell.h \
+ gslice.h \
gslist.h \
gspawn.h \
+ gstdio.h \
gstrfuncs.h \
+ gtestframework.h\
gstring.h \
gthread.h \
gthreadpool.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
if OS_WIN32
# This requires a very new libtool
-export_symbols = -export-symbols $(srcdir)/glib.def
+export_symbols = -export-symbols glib.def
-install-libtool-import-lib:
- $(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
- $(INSTALL) $(srcdir)/glib.def $(DESTDIR)$(libdir)/glib-2.0.def
+install-def-file:
+ $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
-uninstall-libtool-import-lib:
- -rm $(DESTDIR)$(libdir)/libglib-2.0.dll.a $(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 $(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@
+if OS_WIN32
+glib_win32_res = glib-win32-res.o
+glib_win32_res_ldflag = -Wl,$(glib_win32_res)
+endif
+
+if ENABLE_REGEX
+if USE_SYSTEM_PCRE
+pcre_lib = $(PCRE_LIBS)
+pcre_inc = $(PCRE_CFLAGS)
+else
+pcre_lib = pcre/libpcre.la
+pcre_inc =
+endif
+else
+pcre_lib =
+pcre_inc =
+endif
+
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) @GLIB_DEF@
libglib_2_0_la_LDFLAGS = \
+ $(glib_win32_res_ldflag) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols)
if OS_WIN32
-bin_PROGRAMS = gspawn-win32-helper
+bin_PROGRAMS = gspawn-win32-helper gspawn-win32-helper-console
gspawn_win32_helper_LDADD = libglib-2.0.la
gspawn_win32_helper_LDFLAGS = -mwindows
+gspawn_win32_helper_console_LDADD = libglib-2.0.la
-$(G_LIB_WIN32_RESOURCE): glib.rc
- $(top_srcdir)/build/win32/lt-compile-resource glib.rc $@
+glib-win32-res.o: glib.rc
+ $(WINDRES) glib.rc $@
endif
+gspawn-win32-helper-console.c:
+ echo '#include "gspawn-win32-helper.c"' >$@
+
glib-2.0.lib: libglib-2.0.la glib.def
lib -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@