diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-08-09 19:34:08 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-08-09 19:34:08 +0200 |
| commit | 975e6813cc61d5b90c5ccd00aba12ac505dfe485 (patch) | |
| tree | ce3db063b1a5ed80310d013ab0a6f898a5119b99 /gio/giomm | |
| parent | 2ec75e0f199dbc12baaed823c989a7519e208c6b (diff) | |
| download | glibmm-975e6813cc61d5b90c5ccd00aba12ac505dfe485.tar.gz | |
Bring back the giomm reference documentation
* glib/{src,glibmm}/filelist.am: Add namespace prefix glibmm_
to variable names, so that the file lists of glibmm and giomm
can be included together without conflicts.
* gio/{src,giomm}/filelist.am: Add namespace prefix giomm_ to
variable names.
* glib/{src,glibmm}/Makefile.am: Copy the namespace-prefixed
make variables to non-prefixed variables, so that the Automake
include files from mm-common will pick up the values.
* gio/{src,giomm}/Makefile.am: ditto.
* docs/Makefile.am: Include file lists of giomm.
(doc_input): List the header files of both glibmm and giomm.
Diffstat (limited to 'gio/giomm')
| -rw-r--r-- | gio/giomm/Makefile.am | 8 | ||||
| -rw-r--r-- | gio/giomm/filelist.am | 12 |
2 files changed, 15 insertions, 5 deletions
diff --git a/gio/giomm/Makefile.am b/gio/giomm/Makefile.am index 9b0f52fd..7af85c0e 100644 --- a/gio/giomm/Makefile.am +++ b/gio/giomm/Makefile.am @@ -19,6 +19,14 @@ lib_LTLIBRARIES = libgiomm-2.4.la include $(srcdir)/../src/filelist.am include $(srcdir)/filelist.am + +files_built_cc = $(giomm_files_built_cc) +files_built_h = $(giomm_files_built_h) +files_built_ph = $(giomm_files_built_ph) +files_extra_cc = $(giomm_files_extra_cc) +files_extra_h = $(giomm_files_extra_h) +files_extra_ph = $(giomm_files_extra_ph) + include $(top_srcdir)/build/compile-binding.am dist_noinst_HEADERS = slot_async.h diff --git a/gio/giomm/filelist.am b/gio/giomm/filelist.am index 3c79eaa1..541947de 100644 --- a/gio/giomm/filelist.am +++ b/gio/giomm/filelist.am @@ -1,8 +1,10 @@ ## This file is part of glibmm. -files_built_cc = $(files_any_hg:.hg=.cc) $(files_arch_hg:.hg=.cc) wrap_init.cc -files_built_h = $(files_any_hg:.hg=.h) $(files_arch_hg:.hg=.h) -files_built_ph = $(files_any_hg:%.hg=private/%_p.h) $(files_arch_hg:%.hg=private/%_p.h) +giomm_files_built_cc = $(giomm_files_any_hg:.hg=.cc) $(giomm_files_arch_hg:.hg=.cc) wrap_init.cc +giomm_files_built_h = $(giomm_files_any_hg:.hg=.h) $(giomm_files_arch_hg:.hg=.h) +giomm_files_built_ph = $(giomm_files_any_hg:%.hg=private/%_p.h) \ + $(giomm_files_arch_hg:%.hg=private/%_p.h) -files_extra_cc = contenttype.cc init.cc slot_async.cc -files_extra_h = contenttype.h init.h +giomm_files_extra_cc = contenttype.cc init.cc slot_async.cc +giomm_files_extra_h = contenttype.h init.h +giomm_files_extra_ph = |