diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-02 13:22:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-02 13:22:24 +0000 |
| commit | e6c240a691b45c7ab5fd2eadc40f9b8f3b6389b9 (patch) | |
| tree | c3690a0c614ac095080e499203e4c4f714a96fb2 | |
| parent | 1f617ab768a4a7b9d414ed2ba6feb880ab0fa727 (diff) | |
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
| -rw-r--r-- | libs/glibmm2/Makefile.am | 28 | ||||
| -rw-r--r-- | libs/glibmm2/SConscript | 3 |
2 files changed, 5 insertions, 26 deletions
diff --git a/libs/glibmm2/Makefile.am b/libs/glibmm2/Makefile.am index 249db9878b..0587c530f0 100644 --- 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 bbf65ad228..d5593545cf 100644 --- 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') + |