AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

Bug 570406 - gailutil.def is in srcdir, but used from builddir

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2009-02-04 08:20:11 +00:00 committed by Tor Lillqvist
parent fe5715e130
commit 6a36bca4c6
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/other/gail/ChangeLog
View File

@ -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> 2009-02-02 Matthias Clasen <mclasen@redhat.com>
* === Released 2.15.3 === * === Released 2.15.3 ===

19
modules/other/gail/libgail-util/Makefile.am
View File

@ -2,15 +2,15 @@ include $(top_srcdir)/Makefile.decl
EXTRA_DIST += gailutil.def EXTRA_DIST += gailutil.def
if OS_WIN32 if OS_WIN32
export_symbols = -export-symbols gailutil.def export_symbols = -export-symbols $(srcdir)/gailutil.def
no_undefined = -no-undefined no_undefined = -no-undefined
install-libtool-import-lib: install-def-file: gailutil.def
$(INSTALL) .libs/libgailutil.dll.a $(DESTDIR)$(libdir) $(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir)
uninstall-libtool-import-lib: uninstall-def-file:
-rm $(DESTDIR)$(libdir)/libgailutil.dll.a -rm $(DESTDIR)$(libdir)/gailutil.def
else else
install-libtool-import-lib: install-def-file:
uninstall-libtool-import-lib: uninstall-def-file:
endif endif
if MS_LIB_AVAILABLE if MS_LIB_AVAILABLE
@ -75,7 +75,6 @@ libgailutil_la_LDFLAGS = \
gailutil.lib: libgailutil.la gailutil.def gailutil.lib: libgailutil.la gailutil.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@ 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 install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
uninstall-local: uninstall-ms-lib uninstall-def-file