Update an example from 1.3 to 2.x

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

diff --git a/Makefile.am b/Makefile.am
index 16e0b5d..26749a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,8 @@ 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       \
@@ -28,20 +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   \
-       gtk-doc.make
+       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
-
+       config.h.win32          \
+       gtk-doc.make
 
 configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h
@@ -66,10 +71,14 @@ stamp-gc-h: config.status
        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
 
+# install mkinstalldirs for glib-gettextize's benefit
+gettextdir = $(datadir)/glib-2.0/gettext
+gettext_SCRIPTS = mkinstalldirs
+
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc