[librest/wip/teuf/gtask: 34/37] Revert "version script"
- From: Christophe Fergeau <teuf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librest/wip/teuf/gtask: 34/37] Revert "version script"
- Date: Thu, 16 Jun 2016 16:44:59 +0000 (UTC)
commit 8fa08a2dd99619acde5466ddf0434278cf9aa0f4
Author: Christophe Fergeau <cfergeau redhat com>
Date: Thu Jun 16 14:30:57 2016 +0200
Revert "version script"
This reverts commit abee6bd87ac961530b6d05851ab3db2cbdde21e1.
build/ld-version.m4 | 34 ----------------------------------
configure.ac | 2 --
rest/Makefile.am | 26 +-------------------------
3 files changed, 1 insertions(+), 61 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4f9d751..4d92dfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,6 @@ AM_PROG_CC_C_O
LT_PREREQ([2.2.6])
LT_INIT([disable-static])
-RRA_LD_VERSION_SCRIPT
-
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38)
PKG_CHECK_MODULES(SOUP, libsoup-2.4)
PKG_CHECK_MODULES(XML, libxml-2.0)
diff --git a/rest/Makefile.am b/rest/Makefile.am
index fd8fb0d..64205d4 100644
--- a/rest/Makefile.am
+++ b/rest/Makefile.am
@@ -43,20 +43,12 @@ lib_headers = \
EXTRA_DIST = \
rest-marshal.txt
-if HAVE_LD_VERSION_SCRIPT
-LIBREST_SYMBOLS_LDFLAGS = -Wl,--version-script=${srcdir}/librest-map-file
-LIBREST_SYMBOLS_FILE = librest-map-file
-else
-LIBREST_SYMBOLS_LDFLAGS = -export-symbols ${srcdir}/librest-sym-file
-LIBREST_SYMBOLS_FILE = librest-sym-file
-endif
-
lib_LTLIBRARIES = librest- API_VERSION@.la
librest_ API_VERSION@_la_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) \
$(SOUP_CFLAGS) $(SOUP_GNOME_CFLAGS) \
$(XML_CFLAGS) $(GCOV_CFLAGS) \
-I$(top_srcdir) -Wall -DG_LOG_DOMAIN=\"Rest\"
-librest_ API_VERSION@_la_LDFLAGS = -no-undefined $(LIBREST_SYMBOLS_LDFLAGS)
+librest_ API_VERSION@_la_LDFLAGS = -no-undefined
librest_ API_VERSION@_la_LIBADD = $(GLIB_LIBS) $(GTHREAD_LIBS) \
$(SOUP_LIBS) $(SOUP_GNOME_LIBS) $(XML_LIBS) \
$(GCOV_LDFLAGS)
@@ -64,7 +56,6 @@ librest_ API_VERSION@_la_SOURCES = $(lib_sources) $(lib_headers)
nodist_librest_ API_VERSION@_la_SOURCES = $(nodist_lib_sources)
librest_ API_VERSION@_la_HEADERS = $(lib_headers)
librest_ API_VERSION@_ladir = $(includedir)/rest- API_VERSION@/rest
-librest_ API_VERSION@_la_DEPENDENCIES = $(LIBREST_SYMBOLS_FILE)
rest-enum-types.h: stamp-rest-enum-types.h
@true
@@ -146,18 +137,3 @@ CLEANFILES += $(dist_gir_DATA) \
$(NULL)
endif # HAVE_INTROSPECTION
-
-# regeneration of symbol files
-update-map-file: $(lib_headers)
- ( echo "LIBREST_1 {" ; \
- echo "global:" ; \
- ctags -f - -I G_GNUC_CONST --c-kinds=p $^ | awk '/^(rest_|oauth2_|oauth_)/ { print $$1 ";" }' |
sort ; \
- echo "local:" ; \
- echo "*;" ; \
- echo "};" ) > $(srcdir)/librest-map-file
-
-update-sym-file: $(lib_headers)
- ( ctags -f - -I G_GNUC_CONST --c-kinds=p $^ | awk '/^(rest_|oauth2_|oauth_)/ { print $$1 }' | sort ; \
- ) > $(srcdir)/librest-sym-file
-
-update-symbol-files: update-map-file update-sym-file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]