Bump version

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

diff --git a/Makefile.am b/Makefile.am
index ce53445..26749a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4
+AUTOMAKE_OPTIONS = 1.7
 
 SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
 
@@ -10,8 +10,11 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
        -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
 
 EXTRA_DIST =                   \
+       ChangeLog.pre-2-6       \
+       ChangeLog.pre-2-4       \
+       ChangeLog.pre-2-2       \
+       ChangeLog.pre-2-0       \
        ChangeLog.pre-1-2       \
-       glib.spec.in            \
        glib-zip.in             \
        NEWS.pre-1-3            \
        acglib.m4               \
@@ -19,9 +22,7 @@ EXTRA_DIST =                  \
        README.in               \
        INSTALL.in              \
        README.win32            \
-       TODO.xml                \
        makefile.msc            \
-       makefile.mingw          \
        glibconfig.h.win32.in   \
        msvc_recommended_pragmas.h \
        config.h.win32.in       \
@@ -29,18 +30,23 @@ EXTRA_DIST =                        \
        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       \
        glib-2.0-uninstalled.pc.in      \
        gobject-2.0-uninstalled.pc.in   \
        gmodule-2.0-uninstalled.pc.in   \
-       gthread-2.0-uninstalled.pc.in
+       gthread-2.0-uninstalled.pc.in   \
+       gmodule-no-export-2.0-uninstalled.pc.in
+
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST =             \
+       README                  \
+       INSTALL                 \
        glibconfig.h.win32      \
        config.h.win32          \
-       glib.spec               \
-       glib-zip
+       gtk-doc.make
 
 configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h
@@ -51,6 +57,9 @@ install-exec-local: glibconfig.h
        if test -r $$file && cmp -s glibconfig.h $$file; then :; \
        else $(INSTALL_DATA) glibconfig.h $$file; fi
 
+uninstall-local:
+       rm -f $(DESTDIR)$(configexecincludedir)/glibconfig.h
+
 CONFIGURE_DEPENDENCIES = acglib.m4
 
 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
@@ -58,23 +67,28 @@ glibconfig.h: stamp-gc-h
        @if test -f glibconfig.h; then :; \
        else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 stamp-gc-h: config.status
-       CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
+       cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
        echo timestamp > stamp-gc-h
 
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-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
 
 $(pkgconfig_DATA): config.status
 
-glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+# install mkinstalldirs for glib-gettextize's benefit
+gettextdir = $(datadir)/glib-2.0/gettext
+gettext_SCRIPTS = mkinstalldirs
 
-config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+# build documentation when doing distcheck
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h
 
+distclean-local:
+       if test $(srcdir) = .; then :; else \
+           rm -f $(BUILT_EXTRA_DIST); \
+       fi
+
 .PHONY: files release sanity snapshot
 
 files:
@@ -97,32 +111,7 @@ snapcheck:
        $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 dist-hook: $(BUILT_EXTRA_DIST)
-       cd $(top_builddir) && CONFIG_FILES="INSTALL README" CONFIG_HEADERS= $(SHELL) ./config.status
-       files='$(BUILT_EXTRA_DIST) INSTALL README'; \
+       files='$(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"