[gedit] W32: Remove custom libgedit.a import library
- From: Руслан Ижбулатов <ruslanizhb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] W32: Remove custom libgedit.a import library
- Date: Thu, 10 Apr 2014 13:53:57 +0000 (UTC)
commit 0ec205b9879244add3dfdc2c6725e29b1d770672
Author: Руслан Ижбулатов <lrn1986 gmail com>
Date: Sat Apr 5 12:45:44 2014 +0000
W32: Remove custom libgedit.a import library
Since we have a real, shared libgedit.dll, we can have a real libgedit.dll.a
import library.
https://bugzilla.gnome.org/show_bug.cgi?id=727663
configure.ac | 2 +-
gedit/Makefile.am | 5 -----
2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ac35baa..e576ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,7 +406,7 @@ fi
# so we create a lib
if test "$platform_win32" = yes; then
GEDIT_IMPLIB="-lgedit-$GEDIT_API_VERSION"
- PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit.a"
+ PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined"
if test "$os_win32" = yes; then
PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
fi
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 22883be..9a0a34e 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -28,11 +28,7 @@ gedit_gedit_LDADD = \
gedit_gedit_SOURCES = gedit/gedit.c
-if PLATFORM_WIN32
-gedit_gedit_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libgedit.a
-else
gedit_gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
-endif
gedit_libgedit_la_CPPFLAGS = $(gedit_common_cppflags)
gedit_libgedit_la_CFLAGS = $(gedit_common_cflags)
@@ -308,7 +304,6 @@ endif # ENABLE_VAPIGEN
install-exec-hook:
if PLATFORM_WIN32
$(mkinstalldirs) "$(DESTDIR)$(libdir)"
- $(INSTALL_DATA) gedit/libgedit.a "$(DESTDIR)$(libdir)"
else
rm -f $(DESTDIR)$(bindir)/gnome-text-editor
ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]