diff options
| author | Tor Lillqvist <tml@novell.com> | 2009-02-04 08:20:11 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2009-02-04 08:20:11 +0000 |
| commit | 6a36bca4c62f432102ec7a13a7cadd2c63947f4b (patch) | |
| tree | 664fc3436c5e62b01dbd14021f953a47f757a9c6 /modules | |
| parent | fe5715e1301a7ddcfff1f37eee12b8a9b2e965bc (diff) | |
| download | gtk+-6a36bca4c62f432102ec7a13a7cadd2c63947f4b.tar.gz | |
Bug 570406 - gailutil.def is in srcdir, but used from builddir
2009-02-04 Tor Lillqvist <tml@novell.com>
Bug 570406 - gailutil.def is in srcdir, but used from builddir
* libgail-util/Makefile.am: Use gailutil.def from srcdir. Drop
useless rules to install/uninstall import libraries, libtool knows
to install / uninstall them itself when installing / uninstalling
a .la file. Add rules to install / uninstall the def file like for
consistency, like with the other libraries in GTK+.
svn path=/trunk/; revision=22280
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/other/gail/ChangeLog | 10 | ||||
| -rw-r--r-- | modules/other/gail/libgail-util/Makefile.am | 19 |
2 files changed, 19 insertions, 10 deletions
diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog index 15f4a8f198..0bdaf80dd8 100644 --- a/modules/other/gail/ChangeLog +++ b/modules/other/gail/ChangeLog @@ -1,3 +1,13 @@ +2009-02-04 Tor Lillqvist <tml@novell.com> + + Bug 570406 - gailutil.def is in srcdir, but used from builddir + + * libgail-util/Makefile.am: Use gailutil.def from srcdir. Drop + useless rules to install/uninstall import libraries, libtool knows + to install / uninstall them itself when installing / uninstalling + a .la file. Add rules to install / uninstall the def file like for + consistency, like with the other libraries in GTK+. + 2009-02-02 Matthias Clasen <mclasen@redhat.com> * === Released 2.15.3 === diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am index 05957dfdb0..92ed669a6a 100644 --- a/modules/other/gail/libgail-util/Makefile.am +++ b/modules/other/gail/libgail-util/Makefile.am @@ -2,15 +2,15 @@ include $(top_srcdir)/Makefile.decl EXTRA_DIST += gailutil.def if OS_WIN32 -export_symbols = -export-symbols gailutil.def +export_symbols = -export-symbols $(srcdir)/gailutil.def no_undefined = -no-undefined -install-libtool-import-lib: - $(INSTALL) .libs/libgailutil.dll.a $(DESTDIR)$(libdir) -uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libgailutil.dll.a +install-def-file: gailutil.def + $(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir) +uninstall-def-file: + -rm $(DESTDIR)$(libdir)/gailutil.def else -install-libtool-import-lib: -uninstall-libtool-import-lib: +install-def-file: +uninstall-def-file: endif if MS_LIB_AVAILABLE @@ -75,7 +75,6 @@ libgailutil_la_LDFLAGS = \ gailutil.lib: libgailutil.la gailutil.def lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@ -install-data-local: install-ms-lib install-libtool-import-lib - -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib +install-data-local: install-ms-lib install-def-file +uninstall-local: uninstall-ms-lib uninstall-def-file |