fixes to make sure glibmm2 builds under scons from scratch

git-svn-id: svn://localhost/ardour2/branches/3.0@5305 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/glibmm2/Makefile.am b/libs/glibmm2/Makefile.am
index 249db9878b8883c53e08de3bab5835a38d4389a5..0587c530f0b639891df157be1a36373e8377a1f6 100644 (file)
--- a/libs/glibmm2/Makefile.am
+++ b/libs/glibmm2/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS        = -I scripts
 
-SUBDIRS                = tools glib gio examples scripts tests MSVC_Net2005 MSVC_Net2008 docs
+SUBDIRS                = tools glib scripts
 DIST_SUBDIRS   = $(SUBDIRS)
 
 EXTRA_DIST     = build_shared/Makefile_build.am_fragment \
@@ -27,12 +27,6 @@ dist-hook:
        echo; echo
 
 
-include $(top_srcdir)/docs/Makefile_web.am_fragment
-
-doc_tarball_files = \
-       docs/images/*.gif \
-       docs/internal/*.txt docs/internal/*.dia docs/reference/html
-
 # This doesn't work very well in a $(srcdir) != $(builddir) setup,
 # but this target is for maintainer use only anyway.
 
@@ -129,10 +123,9 @@ H2DEF = env python /opt/gnome2/share/pygobject/2.0/codegen/h2def.py
 DEFS_INC_DIR = /opt/gnome2/include
 GEN_ENUM = env perl ./tools/enum.pl
 GEN_EXTRA_DEFS_GLIB = ./tools/extra_defs_gen/generate_extra_defs
-GEN_EXTRA_DEFS_GIO = ./tools/extra_defs_gen/generate_defs_gio
 DOCEXTRACT = /home/jonathon/gnome-build/pygobject/codegen/docextract_to_xml.py
 
-defs: glib-defs gio-defs docextract
+defs: glib-defs docextract
        @echo
        @echo "*** Make sure to examine the .defs files to make sure they look reasonable"
        @echo
@@ -145,21 +138,6 @@ glib-defs:
        $(GEN_ENUM) $(DEFS_INC_DIR)/glib-2.0/gobject/*.h > glib/src/gobject_enums.defs
        $(GEN_ENUM) $(DEFS_INC_DIR)/glib-2.0/gmodule.h > glib/src/gmodule_enums.defs
 
-gio-defs:
-       $(H2DEF) $(DEFS_INC_DIR)/glib-2.0/gio/*.h \
-               $(DEFS_INC_DIR)/gio-unix-2.0/gio/*.h > gio/src/gio_methods.defs
-       $(GEN_ENUM) $(DEFS_INC_DIR)/glib-2.0/gio/*.h \
-               $(DEFS_INC_DIR)/gio-unix-2.0/gio/*.h > gio/src/gio_enums.defs
-       $(GEN_EXTRA_DEFS_GIO) > gio/src/gio_signals.defs
-
-docextract:
-       $(DOCEXTRACT) -s ../glib/glib \
-               -s ../glib/docs/reference/glib \
-               -s ../glib/gobject \
-               -s ../glib/docs/reference/gobject > glib/src/glib_docs.xml
-       $(DOCEXTRACT) -s ../glib/gio \
-               -s ../glib/docs/reference/gio > gio/src/gio_docs.xml
-
 
-.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild release tag-release upload-release release-announce install-module defs glib-defs gio-defs docextract
+.PHONY: post-html post-html-local post-html-recursive release tag-release upload-release release-announce install-module defs glib-defs 
 

diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript
index bbf65ad2283a221b7b2aa971a52f4e6f254d274c..d5593545cf7caef7b7dbaa96a9bc9e7a3e554afb 100644 (file)
--- a/libs/glibmm2/SConscript
+++ b/libs/glibmm2/SConscript
@@ -41,7 +41,8 @@ env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                        'glib/glibmmconfig.h.in',
                                        'glib/glibmm-2.4.pc.in',
                                        'glib/glibmm/Makefile.in',
-                                       'scripts'
+                                       'scripts',
+                                       'build_shared'
                                        ] +
                                     glibmm2_files + 
                                     glob.glob('glib/glibmm/*.h') +