Add enum type for GVariantParseError

[platform/upstream/glib.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b2a0a41..ae59aa2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,9 @@ 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      \
@@ -28,6 +31,7 @@ EXTRA_DIST +=                         \
        NEWS.pre-1-3            \
        acglib.m4               \
        sanity_check            \
+       README.commits          \
        README.in               \
        INSTALL.in              \
        README.win32            \
@@ -49,19 +53,21 @@ EXTRA_DIST +=                       \
        gthread-2.0.pc.in       \
        gio-2.0.pc.in           \
        gio-unix-2.0.pc.in      \
+       gio-windows-2.0.pc.in   \
        glib-2.0-uninstalled.pc.in      \
        gobject-2.0-uninstalled.pc.in   \
        gmodule-2.0-uninstalled.pc.in   \
        gthread-2.0-uninstalled.pc.in   \
        gmodule-no-export-2.0-uninstalled.pc.in \
        gio-2.0-uninstalled.pc.in               \
-       gio-unix-2.0-uninstalled.pc.in  
+       gio-unix-2.0-uninstalled.pc.in
 
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST =             \
        README                  \
        INSTALL                 \
+       ChangeLog               \
        glibconfig.h.win32      \
        config.h.win32          \
        gtk-doc.make
@@ -76,14 +82,35 @@ CONFIGURE_DEPENDENCIES = acglib.m4
 
 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
 glibconfig.h: stamp-gc-h
-       @if test -f glibconfig.h; then :; \
+       $(AM_V_GEN) if test -f glibconfig.h; then :; \
        else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 stamp-gc-h: config.status
        cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
        echo timestamp > stamp-gc-h
 
+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 gio-unix-2.0.pc
+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
 
@@ -94,14 +121,14 @@ gettext_SCRIPTS = mkinstalldirs
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man
 
-DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h
+DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h config.lt
 
 distclean-local:
        if test $(srcdir) = .; then :; else \
            rm -f $(BUILT_EXTRA_DIST); \
        fi
 
-.PHONY: files release sanity snapshot
+.PHONY: files release sanity snapshot ChangeLog
 
 files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \