mirror of
https://gitlab.freedesktop.org/pkg-config/pkg-config.git
synced 2025-12-20 04:20:04 +01:00
90320817dc
This is the latest stable release from upstream. Patches have been refreshed, including putting the removal of most pkg-config checks into the glib-only patch. A few more files, most notably the large NEWS file, have also been removed from the repo to keep the size of the snapshot down.
628 lines
18 KiB
Diff
628 lines
18 KiB
Diff
diff --git a/glib/Makefile.am b/glib/Makefile.am
|
|
index 4f60a02..583b914 100644
|
|
--- a/glib/Makefile.am
|
|
+++ b/glib/Makefile.am
|
|
@@ -6,14 +6,8 @@ include $(top_srcdir)/glib.mk
|
|
|
|
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
|
|
|
|
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
|
|
-DIST_SUBDIRS = $(SUBDIRS) build
|
|
-
|
|
-bin_SCRIPTS = glib-gettextize
|
|
-
|
|
-if OS_LINUX
|
|
-TESTS += check-abis.sh
|
|
-endif
|
|
+SUBDIRS = . m4macros glib
|
|
+DIST_SUBDIRS = $(SUBDIRS)
|
|
|
|
AM_CPPFLAGS = \
|
|
-DG_LOG_DOMAIN=g_log_domain_glib \
|
|
@@ -22,85 +16,19 @@ AM_CPPFLAGS = \
|
|
-DGLIB_COMPILATION
|
|
|
|
EXTRA_DIST += \
|
|
- ChangeLog.pre-2-20 \
|
|
- ChangeLog.pre-2-18 \
|
|
- ChangeLog.pre-2-16 \
|
|
- ChangeLog.pre-2-14 \
|
|
- ChangeLog.pre-2-12 \
|
|
- ChangeLog.pre-2-10 \
|
|
- ChangeLog.pre-2-8 \
|
|
- ChangeLog.pre-2-6 \
|
|
- ChangeLog.pre-2-4 \
|
|
- ChangeLog.pre-2-2 \
|
|
- ChangeLog.pre-2-0 \
|
|
- ChangeLog.pre-1-2 \
|
|
- glib-zip.in \
|
|
- NEWS.pre-1-3 \
|
|
acglib.m4 \
|
|
- sanity_check \
|
|
- README.commits \
|
|
README.in \
|
|
- INSTALL.in \
|
|
- README.win32 \
|
|
- HACKING \
|
|
- autogen.sh \
|
|
glib.mk \
|
|
- glib-tap.mk \
|
|
- tap-test \
|
|
- makefile.msc \
|
|
- msvc_recommended_pragmas.h \
|
|
- config.h.win32.in \
|
|
- po/po2tbl.sed.in \
|
|
- glib-2.0.pc.in \
|
|
- gobject-2.0.pc.in \
|
|
- gmodule-2.0.pc.in \
|
|
- gmodule-export-2.0.pc.in \
|
|
- gmodule-no-export-2.0.pc.in \
|
|
- gthread-2.0.pc.in \
|
|
- gio-2.0.pc.in \
|
|
- gio-unix-2.0.pc.in \
|
|
- gio-windows-2.0.pc.in \
|
|
- check-abis.sh \
|
|
- gtk-doc.make \
|
|
$(NULL)
|
|
|
|
|
|
# These may be in the builddir too
|
|
BUILT_EXTRA_DIST += \
|
|
README \
|
|
- INSTALL \
|
|
- ChangeLog \
|
|
- config.h.win32 \
|
|
$(NULL)
|
|
|
|
CONFIGURE_DEPENDENCIES = acglib.m4
|
|
|
|
-ChangeLog:
|
|
- $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
|
|
- (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only > $@.tmp \
|
|
- && mv -f $@.tmp $@ \
|
|
- || ($(RM) $@.tmp; \
|
|
- echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
|
|
- (test -f $@ || echo git-log is required to generate this file >> $@)); \
|
|
- else \
|
|
- test -f $@ || \
|
|
- (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
|
|
- echo A git checkout and git-log is required to generate this file >> $@); \
|
|
- fi
|
|
-
|
|
-pkgconfigdir = $(libdir)/pkgconfig
|
|
-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc gio-2.0.pc
|
|
-
|
|
-if OS_UNIX
|
|
-pkgconfig_DATA += gio-unix-2.0.pc
|
|
-endif
|
|
-
|
|
-if OS_WIN32
|
|
-pkgconfig_DATA += gio-windows-2.0.pc
|
|
-endif
|
|
-
|
|
-$(pkgconfig_DATA): config.status
|
|
-
|
|
# build documentation when doing distcheck
|
|
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
|
|
|
|
@@ -111,7 +39,7 @@ distclean-local: lcov-clean
|
|
rm -f $(BUILT_EXTRA_DIST); \
|
|
fi
|
|
|
|
-.PHONY: files release sanity snapshot ChangeLog
|
|
+.PHONY: files release sanity snapshot
|
|
|
|
files:
|
|
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
|
|
diff --git a/glib/configure.ac b/glib/configure.ac
|
|
index 797cb92..295e008 100644
|
|
--- a/glib/configure.ac
|
|
+++ b/glib/configure.ac
|
|
@@ -435,28 +435,9 @@ AS_IF([ test x"$glib_native_win32" = xyes], [
|
|
])
|
|
|
|
dnl
|
|
-dnl zlib support
|
|
-dnl
|
|
-PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no])
|
|
-AS_IF([test "x$found_zlib" = "xno"], [
|
|
- AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)])
|
|
- if test "x$found_zlib" = "xno" ; then
|
|
- AC_MSG_ERROR([*** Working zlib library and headers not found ***])
|
|
- fi
|
|
- ZLIB_LIBS='-lz'
|
|
- AC_SUBST(ZLIB_LIBS)
|
|
-])
|
|
-
|
|
-PKG_CHECK_MODULES(LIBFFI, [libffi >= 3.0.0])
|
|
-AC_SUBST(LIBFFI_CFLAGS)
|
|
-AC_SUBST(LIBFFI_LIBS)
|
|
-
|
|
-dnl
|
|
dnl gettext support
|
|
dnl
|
|
|
|
-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
|
|
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
|
|
GLIB_GNU_GETTEXT
|
|
|
|
if test "$gt_cv_have_gettext" != "yes" ; then
|
|
@@ -1739,27 +1720,6 @@ AC_ARG_WITH(gio-module-dir,
|
|
GIO_MODULE_DIR=$with_gio_module_dir
|
|
AC_SUBST(GIO_MODULE_DIR)
|
|
|
|
-dnl **********************************
|
|
-dnl *** Check for libselinux (GIO) ***
|
|
-dnl **********************************
|
|
-AC_ARG_ENABLE(selinux,
|
|
- AS_HELP_STRING([--disable-selinux],
|
|
- [build without selinux support]))
|
|
-msg_selinux=no
|
|
-SELINUX_LIBS=
|
|
-AS_IF([ test "x$enable_selinux" != "xno"], [
|
|
-
|
|
- AC_CHECK_LIB(selinux, is_selinux_enabled,
|
|
- [AC_CHECK_HEADERS(selinux/selinux.h,
|
|
- [AC_CHECK_LIB(selinux, lgetfilecon_raw,
|
|
- [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
|
|
- SELINUX_LIBS="-lselinux"
|
|
- msg_selinux=yes])
|
|
- ])
|
|
- ])
|
|
-])
|
|
-AC_SUBST(SELINUX_LIBS)
|
|
-
|
|
dnl *****************************
|
|
dnl ** Check for inotify (GIO) **
|
|
dnl *****************************
|
|
@@ -1799,118 +1759,6 @@ int main() { return 0; } ]])],
|
|
|
|
AM_CONDITIONAL(HAVE_FEN, [test "$fen_support" = "yes"])
|
|
|
|
-dnl ****************************
|
|
-dnl *** Checks for FAM (GIO) ***
|
|
-dnl ****************************
|
|
-
|
|
-should_disable_fam=no
|
|
-
|
|
-AC_ARG_ENABLE(fam,
|
|
- AS_HELP_STRING([--disable-fam],
|
|
- [don't use fam for file system monitoring]),
|
|
- [
|
|
- if test "x$enable_fam" = "xno"; then
|
|
- should_disable_fam=yes
|
|
- fi
|
|
- ]
|
|
- )
|
|
-fam_support=no
|
|
-FAM_LIBS=
|
|
-if test "x$should_disable_fam" = "xno"; then
|
|
-AC_CHECK_LIB(fam, FAMOpen,
|
|
- [AC_CHECK_HEADERS(fam.h,
|
|
- [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM])
|
|
- AC_CHECK_LIB(fam, FAMNoExists,
|
|
- AC_DEFINE(HAVE_FAM_NO_EXISTS, [], [Define if we have FAMNoExists in fam]))
|
|
- FAM_LIBS="-lfam"]
|
|
- fam_support=yes,
|
|
- AC_MSG_WARN(*** FAM support will not be built (header files not found) ***))],
|
|
- AC_MSG_WARN(*** FAM support will not be built (FAM library not found) ***))
|
|
-AC_SUBST(FAM_LIBS)
|
|
-fi
|
|
-AM_CONDITIONAL(HAVE_FAM, [test "$fam_support" = "yes"])
|
|
-
|
|
-
|
|
-dnl *****************************
|
|
-dnl *** Check for xattr (GIO) ***
|
|
-dnl *****************************
|
|
-AC_ARG_ENABLE(xattr,
|
|
- AS_HELP_STRING([--disable-xattr], [build without xattr support]))
|
|
-msg_xattr=no
|
|
-XATTR_LIBS=
|
|
-AS_IF([ test "x$enable_xattr" != "xno"], [
|
|
-
|
|
-dnl either glibc or libattr can provide xattr support
|
|
-
|
|
-dnl for both of them, we check for getxattr being in
|
|
-dnl the library and a valid xattr header.
|
|
-
|
|
-dnl try glibc
|
|
- AC_CHECK_LIB(c, getxattr,
|
|
- [AC_CHECK_HEADERS(sys/xattr.h,
|
|
- [AC_DEFINE(HAVE_XATTR, 1, [Define to 1 if xattr is available])
|
|
- msg_xattr=yes])
|
|
- ])
|
|
-
|
|
- AS_IF([ test "x$msg_xattr" != "xyes"], [
|
|
-dnl failure. try libattr
|
|
- AC_CHECK_LIB(attr, getxattr,
|
|
- [AC_CHECK_HEADERS(attr/xattr.h,
|
|
- [AC_DEFINE(HAVE_XATTR, 1, [Define to 1 if xattr is available])
|
|
- XATTR_LIBS="-lattr"
|
|
- msg_xattr=yes])
|
|
- ])
|
|
- ])
|
|
-
|
|
- AS_IF([ test "x$msg_xattr" = "xyes"], [
|
|
- AC_MSG_CHECKING([for XATTR_NOFOLLOW])
|
|
- AC_TRY_COMPILE([
|
|
- #include <stdio.h>
|
|
- #ifdef HAVE_SYS_TYPES_H
|
|
- #include <sys/types.h>
|
|
- #endif
|
|
- #ifdef HAVE_SYS_XATTR_H
|
|
- #include <sys/xattr.h>
|
|
- #elif HAVE_ATTR_XATTR_H
|
|
- #include <attr/xattr.h>
|
|
- #endif
|
|
- ],
|
|
- [ssize_t len = getxattr("", "", NULL, 0, 0, XATTR_NOFOLLOW);],
|
|
- [
|
|
- AC_DEFINE([HAVE_XATTR_NOFOLLOW], [1], [Define to 1 if xattr API uses XATTR_NOFOLLOW])
|
|
- AC_MSG_RESULT([yes])
|
|
- ],
|
|
- [AC_MSG_RESULT([no])]
|
|
- )
|
|
- ])
|
|
-])
|
|
-AC_SUBST(XATTR_LIBS)
|
|
-
|
|
-dnl ************************
|
|
-dnl *** check for libelf ***
|
|
-dnl ************************
|
|
-AC_ARG_ENABLE(libelf,
|
|
- AS_HELP_STRING([--disable-libelf], [build without libelf support]))
|
|
-AS_IF([ test "x$enable_libelf" != "xno"],[
|
|
-PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe])
|
|
-AS_IF([ test $have_libelf = maybe ], [
|
|
- glib_save_LIBS=$LIBS
|
|
- AC_CHECK_LIB([elf], [elf_begin], [:], [have_libelf=no])
|
|
- AC_CHECK_LIB([elf], [elf_getshdrstrndx], [:], [have_libelf=no])
|
|
- AC_CHECK_LIB([elf], [elf_getshdrnum], [:], [have_libelf=no])
|
|
- AC_CHECK_HEADER([libelf.h], [:], [have_libelf=no])
|
|
- LIBS=$glib_save_LIBS
|
|
-
|
|
- if test $have_libelf != no; then
|
|
- LIBELF_LIBS=-lelf
|
|
- have_libelf=yes
|
|
- fi
|
|
-])
|
|
-])
|
|
-
|
|
-if test x$have_libelf = xyes; then
|
|
- AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
|
|
-fi
|
|
|
|
dnl ****************************************
|
|
dnl *** platform dependent source checks ***
|
|
@@ -2707,122 +2555,6 @@ AS_IF([ test $cross_compiling = yes ], [
|
|
fi
|
|
])
|
|
|
|
-dnl **************************
|
|
-dnl *** Checks for gtk-doc ***
|
|
-dnl **************************
|
|
-# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
|
|
-# it on it's own line.
|
|
-m4_ifdef([GTK_DOC_CHECK], [
|
|
-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
|
|
-],[
|
|
-AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
|
|
-])
|
|
-
|
|
-AC_ARG_ENABLE(man,
|
|
- [AS_HELP_STRING([--enable-man],
|
|
- [generate man pages [default=auto]])],,
|
|
- enable_man=maybe)
|
|
-
|
|
-AS_IF([test "$enable_man" != no], [
|
|
- AC_PATH_PROG([XSLTPROC], [xsltproc])
|
|
- AS_IF([test -z "$XSLTPROC"], [
|
|
- AS_IF([test "$enable_man" = yes], [
|
|
- AC_MSG_ERROR([xsltproc is required for --enable-man])
|
|
- ])
|
|
- enable_man=no
|
|
- ])
|
|
-])
|
|
-
|
|
-AS_IF([ test "$enable_man" != no ], [
|
|
- dnl check for DocBook DTD in the local catalog
|
|
- JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
|
|
- [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
|
|
- AS_IF([test "$have_docbook_dtd" != yes], [
|
|
- AS_IF([test "$enable_man" = yes ], [
|
|
- AC_MSG_ERROR([DocBook DTD is required for --enable-man])
|
|
- ])
|
|
- enable_man=no
|
|
- ])
|
|
-])
|
|
-
|
|
-AS_IF([test "$enable_man" != no], [
|
|
- dnl check for DocBook XSL stylesheets in the local catalog
|
|
- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
|
|
- [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
|
|
- AS_IF([ test "$have_docbook_dtd" != yes ], [
|
|
- AS_IF([ test "$enable_man" = yes ], [
|
|
- AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
|
|
- ])
|
|
- enable_man=no
|
|
- ])
|
|
-])
|
|
-
|
|
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
|
|
-
|
|
-AC_MSG_CHECKING([whether to generate man pages])
|
|
-AS_IF([ test "$enable_man" != no ], [
|
|
- AC_MSG_RESULT([yes])
|
|
-], [
|
|
- AC_MSG_RESULT([no])
|
|
-])
|
|
-
|
|
-dnl
|
|
-dnl Tracing
|
|
-dnl
|
|
-
|
|
-AC_ARG_ENABLE([dtrace],
|
|
- [AS_HELP_STRING([--enable-dtrace],
|
|
- [include tracing support for dtrace])])
|
|
-have_dtrace=no
|
|
-AC_MSG_CHECKING([whether to include dtrace tracing support])
|
|
-AS_IF([ test "x$enable_dtrace" != xno], [
|
|
- if test x$glib_have_carbon = xyes; then
|
|
- AC_MSG_RESULT([no (not yet compatible with MacOS dtrace)])
|
|
- else
|
|
- AC_MSG_RESULT([yes])
|
|
- AC_CHECK_PROGS(DTRACE, dtrace)
|
|
- if test -z "$DTRACE"; then
|
|
- if test "x$enable_dtrace" = xyes; then
|
|
- AC_MSG_ERROR([dtrace not found])
|
|
- fi
|
|
- else
|
|
- AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
|
|
- [if test "x$enable_dtrace" = xyes; then
|
|
- AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
|
|
- fi])
|
|
- fi
|
|
- fi
|
|
-], [
|
|
- AC_MSG_RESULT([no])
|
|
-])
|
|
-if test "x$have_dtrace" = xyes; then
|
|
- AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if using dtrace probes.])
|
|
-fi
|
|
-AM_CONDITIONAL([ENABLE_DTRACE], [test x$have_dtrace = xyes ])
|
|
-
|
|
-AC_MSG_CHECKING([whether to include systemtap tracing support])
|
|
-AC_ARG_ENABLE([systemtap],
|
|
- [AS_HELP_STRING([--enable-systemtap],
|
|
- [include tracing support for systemtap])])
|
|
-have_systemtap=no
|
|
-if test "x$enable_systemtap" != xno -a "x$have_dtrace" = xyes; then
|
|
- have_systemtap=yes
|
|
-fi
|
|
-AC_MSG_RESULT(${have_systemtap})
|
|
-
|
|
-AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$have_systemtap = xyes])
|
|
-
|
|
-AC_ARG_WITH([tapset-install-dir],
|
|
- AS_HELP_STRING([--with-tapset-install-dir=DIR],
|
|
- [path where systemtap tapsets are installed [DATADIR/systemtap/tapset]]),
|
|
- [if test "x${withval}" = x; then
|
|
- ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
|
|
- else
|
|
- ABS_TAPSET_DIR="${withval}"
|
|
- fi],
|
|
- [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
|
|
-AC_SUBST(ABS_TAPSET_DIR)
|
|
-
|
|
dnl ************************************
|
|
dnl *** Enable lcov coverage reports ***
|
|
dnl ************************************
|
|
@@ -3630,20 +3362,6 @@ typedef unsigned $gint64 guint64;])
|
|
AC_CHECK_TYPE([unsigned long])
|
|
AC_CHECK_ALIGNOF([unsigned long])
|
|
|
|
-# Check for libdbus1 - Optional - is only used in the GDBus test cases
|
|
-#
|
|
-# 1.2.14 required for dbus_message_set_serial
|
|
-PKG_CHECK_MODULES(DBUS1,
|
|
- dbus-1 >= 1.2.14,
|
|
- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
|
|
- have_dbus1=no)
|
|
-AC_SUBST(DBUS1_CFLAGS)
|
|
-AC_SUBST(DBUS1_LIBS)
|
|
-AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
|
|
-
|
|
-AC_CHECK_PROGS([DBUS_DAEMON], [dbus-daemon])
|
|
-AM_CONDITIONAL([HAVE_DBUS_DAEMON], [test x$DBUS_DAEMON = xdbus-daemon ])
|
|
-
|
|
dnl
|
|
dnl Check for -Bsymbolic-functions linker flag used to avoid
|
|
dnl intra-library PLT jumps, if available.
|
|
@@ -3751,92 +3469,22 @@ AC_SUBST(gio_INCLUDES)
|
|
|
|
|
|
AC_CONFIG_FILES([
|
|
-glib-2.0.pc
|
|
-gmodule-2.0.pc
|
|
-gmodule-export-2.0.pc
|
|
-gmodule-no-export-2.0.pc
|
|
-gthread-2.0.pc
|
|
-gobject-2.0.pc
|
|
-gio-2.0.pc
|
|
-gio-unix-2.0.pc
|
|
-gio-windows-2.0.pc
|
|
-glib-zip
|
|
-glib-gettextize
|
|
Makefile
|
|
-build/Makefile
|
|
-build/win32/Makefile
|
|
-build/win32/dirent/Makefile
|
|
-build/win32/vs9/Makefile
|
|
-build/win32/vs10/Makefile
|
|
-build/win32/vs11/Makefile
|
|
glib/Makefile
|
|
-glib/glib.stp
|
|
glib/libcharset/Makefile
|
|
glib/gnulib/Makefile
|
|
glib/pcre/Makefile
|
|
glib/update-pcre/Makefile
|
|
-glib/tests/Makefile
|
|
-gmodule/Makefile
|
|
-gmodule/gmoduleconf.h
|
|
-gobject/Makefile
|
|
-gobject/gobject.stp
|
|
-gobject/glib-mkenums
|
|
-gobject/tests/Makefile
|
|
-gthread/Makefile
|
|
-gio/Makefile
|
|
-gio/gdbus-2.0/codegen/Makefile
|
|
-gio/gdbus-2.0/codegen/config.py
|
|
-gio/gnetworking.h
|
|
-gio/xdgmime/Makefile
|
|
-gio/inotify/Makefile
|
|
-gio/kqueue/Makefile
|
|
-gio/fen/Makefile
|
|
-gio/fam/Makefile
|
|
-gio/win32/Makefile
|
|
-gio/tests/Makefile
|
|
-gio/tests/gdbus-object-manager-example/Makefile
|
|
-gio/tests/services/Makefile
|
|
-gio/tests/services/org.gtk.GDBus.Examples.ObjectManager.service
|
|
-po/Makefile.in
|
|
-docs/Makefile
|
|
-docs/reference/Makefile
|
|
-docs/reference/glib/Makefile
|
|
-docs/reference/glib/version.xml
|
|
-docs/reference/gobject/Makefile
|
|
-docs/reference/gobject/version.xml
|
|
-docs/reference/gio/Makefile
|
|
-docs/reference/gio/gdbus-object-manager-example/Makefile
|
|
-docs/reference/gio/version.xml
|
|
-tests/Makefile
|
|
-tests/gobject/Makefile
|
|
-tests/refcount/Makefile
|
|
m4macros/Makefile
|
|
])
|
|
|
|
-AC_CONFIG_COMMANDS([chmod-scripts],
|
|
-[chmod 0755 glib-zip
|
|
-chmod 0755 glib-gettextize
|
|
-chmod 0755 gobject/glib-mkenums])
|
|
-
|
|
# we want to invoke this macro solely so that the config.status script
|
|
# and automake generated makefiles know about these generated files.
|
|
# They are only needed to distcheck the package
|
|
if false; then
|
|
AC_CONFIG_FILES([
|
|
- INSTALL
|
|
README
|
|
- config.h.win32
|
|
- glib/glibconfig.h.win32
|
|
- glib/makefile.msc
|
|
glib/glib.rc
|
|
- gmodule/makefile.msc
|
|
- gmodule/gmodule.rc
|
|
- gobject/makefile.msc
|
|
- gobject/gobject.rc
|
|
- gthread/makefile.msc
|
|
- gthread/gthread.rc
|
|
- gio/gio.rc
|
|
- tests/makefile.msc
|
|
])
|
|
fi
|
|
|
|
diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
|
|
index 1330755..07b0141 100644
|
|
--- a/glib/glib/Makefile.am
|
|
+++ b/glib/glib/Makefile.am
|
|
@@ -31,8 +31,8 @@ else
|
|
MAYBE_PCRE = pcre
|
|
endif
|
|
|
|
-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
|
|
-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
|
|
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
|
|
+DIST_SUBDIRS = libcharset gnulib pcre update-pcre
|
|
|
|
AM_CPPFLAGS = \
|
|
$(glib_INCLUDES) \
|
|
@@ -53,12 +53,10 @@ MIRRORING_TAB_SOURCE = \
|
|
# The compilation of GRegex can be disabled, but the source files must
|
|
# be distributed.
|
|
EXTRA_DIST += \
|
|
- makefile.msc.in \
|
|
glib.rc.in \
|
|
gen-iswide-table.py \
|
|
gen-unicode-tables.pl \
|
|
gen-script-table.pl \
|
|
- glibconfig.h.win32.in \
|
|
gregex.c \
|
|
gregex.h \
|
|
win_iconv.c \
|
|
@@ -71,8 +69,6 @@ CLEANFILES += libglib-gdb.py
|
|
|
|
# These may be in the builddir too
|
|
BUILT_EXTRA_DIST += \
|
|
- makefile.msc \
|
|
- glibconfig.h.win32 \
|
|
glib.rc
|
|
|
|
lib_LTLIBRARIES = libglib-2.0.la
|
|
@@ -101,7 +97,6 @@ deprecated_sources = \
|
|
|
|
libglib_2_0_la_SOURCES = \
|
|
$(deprecated_sources) \
|
|
- glib_probes.d \
|
|
garray.c \
|
|
gasyncqueue.c \
|
|
gasyncqueueprivate.h \
|
|
@@ -359,29 +354,6 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
|
|
|
|
INSTALL_PROGS=
|
|
|
|
-if ENABLE_DTRACE
|
|
-DTCOMPILE = $(patsubst -W%,,$(LTCOMPILE))
|
|
-DTCFLAGS = $(patsubst -W%,,$(CFLAGS))
|
|
-
|
|
-glib_probes.h: glib_probes.d
|
|
- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
|
|
- @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
|
|
-
|
|
-glib_probes.lo: glib_probes.d
|
|
- $(AM_V_GEN) env CC="$(DTCOMPILE)" CFLAGS="$(DTCFLAGS)" $(DTRACE) -G -s $< -o $@
|
|
-
|
|
-BUILT_SOURCES += glib_probes.h glib_probes.lo
|
|
-CLEANFILES += glib_probes.h glib_probes.h.tmp
|
|
-libglib_2_0_la_LIBADD += glib_probes.lo
|
|
-endif
|
|
-
|
|
-if ENABLE_SYSTEMTAP
|
|
-tapset_in_files = glib.stp.in
|
|
-tapsetdir = @ABS_TAPSET_DIR@
|
|
-tapset_DATA = $(tapset_in_files:.stp.in=.stp)
|
|
-EXTRA_DIST += $(tapset_in_files)
|
|
-endif
|
|
-
|
|
gspawn-win32-helper-console.c:
|
|
echo '#define HELPER_CONSOLE' >$@
|
|
echo '#include "gspawn-win32-helper.c"' >>$@
|
|
@@ -443,7 +415,7 @@ endif
|
|
glib-2.0.lib: libglib-2.0.la glib.def
|
|
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@
|
|
|
|
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters
|
|
+dist-hook: $(BUILT_EXTRA_DIST)
|
|
files='$(BUILT_EXTRA_DIST)'; \
|
|
for f in $$files; do \
|
|
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
|
diff --git a/glib/glib/gnulib/Makefile.am b/glib/glib/gnulib/Makefile.am
|
|
index 931230e..06ce41c 100644
|
|
--- a/glib/glib/gnulib/Makefile.am
|
|
+++ b/glib/glib/gnulib/Makefile.am
|
|
@@ -22,6 +22,3 @@ libgnulib_la_SOURCES = \
|
|
printf.c \
|
|
printf.h \
|
|
g-gnulib.h
|
|
-
|
|
-
|
|
-EXTRA_DIST += makefile.msc
|