Fix include statements so they match all other files in gtk2_ardour

[ardour.git] / libs / glibmm2 / Makefile.am

diff --git a/libs/glibmm2/Makefile.am b/libs/glibmm2/Makefile.am
index c19f75098238b2214a8f46471f2dcd1e4d04c20f..97a0aee0eb76399800e04534c00dd1dfbf921e04 100644 (file)
--- a/libs/glibmm2/Makefile.am
+++ b/libs/glibmm2/Makefile.am
@@ -1,16 +1,15 @@
 ACLOCAL_AMFLAGS        = -I scripts
 
-SUBDIRS                = glibmm 
+SUBDIRS                = tools glib examples docs scripts tests MSVC_Net2003
 DIST_SUBDIRS   = $(SUBDIRS)
 
-glibmm_includedir       = $(includedir)/glibmm-2.4
-glibmm_include_HEADERS  = glibmm.h
+EXTRA_DIST     = build_shared/Makefile_build.am_fragment \
+                 build_shared/Makefile_build_gensrc.am_fragment \
+                 build_shared/Makefile_gensrc.am_fragment \
+                 build_shared/Makefile_gensrc_platform.am_fragment \
+                 build_shared/Makefile_build_extra.am_fragment \
+                 CHANGES README.win32
 
-glibmm_configdir        = $(libdir)/glibmm-2.4/include
-glibmm_config_DATA      = glibmmconfig.h
-
-pkgconfigdir            = $(libdir)/pkgconfig
-pkgconfig_DATA          = glibmm-2.4.pc
 
 all-local:
        @echo "*** Everything completed ***"
@@ -27,3 +26,39 @@ dist-hook:
        echo "**********************************************************"; \
        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.
+
+glibmm-docs.tar.gz:
+       find examples -name '*.cc' -o -name '*.h' -o -name '*.xpm' -o -name '*.xml' | \
+       tar cf - --files-from - $(doc_tarball_files) | gzip -c --best >$@
+
+# Upload documentation and examples:
+
+post-html-recursive:
+       list='docs examples'; for subdir in $$list; do \
+         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \
+       done
+
+post-html-local: glibmm-docs.tar.gz
+       rsync $(rsync_args) glibmm-docs.tar.gz $$USER@$(web_host):$(web_path_gtkmm)
+
+post-html: post-html-recursive post-html-local
+
+doc-clean-recursive:
+       (cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-clean)
+
+doc-clean: doc-clean-recursive
+
+doc-rebuild:
+       (cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-rebuild)
+
+.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild
+