diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2008-01-10 14:25:46 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2008-01-10 14:25:46 +0000 |
| commit | 30d0830ca13a2f800dfbff7db8873d10b903bb96 (patch) | |
| tree | feecaf19b03e4419c0b67a2633725236b44a27c7 /Makefile.am | |
| parent | 733e609fa9b2054010dd284d330672ccd4c89a8d (diff) | |
| download | glibmm-30d0830ca13a2f800dfbff7db8873d10b903bb96.tar.gz | |
Copy (and very slightly adjust) the build_shared/ files from gtkmm, which
2008-01-10 Murray Cumming <murrayc@murrayc.com>
* Makefile.am:
* build_shared/Makefile_build.am_fragment:
* build_shared/Makefile_build_extra.am_fragment:
* build_shared/Makefile_build_gensrc.am_fragment:
* build_shared/Makefile_gensrc.am_fragment:
* build_shared/Makefile_gensrc_platform.am_fragment:
Copy (and very slightly adjust) the build_shared/ files from
gtkmm, which has had multiple sub-libraries for a long time.
* gio/giomm/Makefile.am:
* gio/src/Makefile.am:
* gio/src/Makefile_list_of_hg.am_fragment:
* glib/glibmm/Makefile.am:
* glib/glibmm/private/Makefile.am:
* glib/src/Makefile.am:
* glib/src/Makefile_list_of_hg.am_fragment:
Adapt to the structure (variable names, mostly) needed by the
newer build_shared/ files, so that the giomm library is actually
built.
* tools/m4/convert_glib.m4:
* gio/giomm/init.cc:
* gio/giomm/init.h:
* gio/src/asyncresult.ccg:
* gio/src/drive.ccg:
* gio/src/drive.hg:
* gio/src/file.ccg:
* gio/src/file.hg:
* gio/src/fileattribute.ccg:
* gio/src/fileinputstream.hg:
* gio/src/fileoutputstream.hg:
* gio/src/volume.ccg:
* gio/src/volume.hg: Various build fixes, including adding a flags
parameter to unmount and eject methods.
svn path=/trunk/; revision=497
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index dd409ef6..63c5263a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,7 @@ DIST_SUBDIRS = $(SUBDIRS) 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 \ + build_shared/Makefile_conditional.am_fragment \ CHANGES README.win32 |