Page MenuHomeClusterLabs Projects
Files F3152397

No OneTemporary
Actions

View Options

diff --git a/libknet/Makefile.am b/libknet/Makefile.am
index 9381a0a1..60d2a944 100644
--- a/libknet/Makefile.am
+++ b/libknet/Makefile.am
@@ -1,67 +1,71 @@
#
# Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
#
# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
# Federico Simoncelli <fsimon@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
include $(top_srcdir)/build-aux/check.mk
-EXTRA_DIST = libknet.versions
+SYMFILE = libknet_exported_syms
+
+EXTRA_DIST = $(SYMFILE)
SUBDIRS = . tests
libversion = 0:0:0
sources = \
common.c \
crypto.c \
handle.c \
host.c \
listener.c \
link.c \
logging.c \
nsscrypto.c \
threads_common.c \
threads_dsthandler.c \
threads_heartbeat.c \
threads_pmtud.c \
threads_send_recv.c
include_HEADERS = libknet.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libknet.pc
noinst_HEADERS = \
common.h \
crypto.h \
host.h \
internals.h \
link.h \
listener.h \
logging.h \
nsscrypto.h \
onwire.h \
threads_common.h \
threads_dsthandler.h \
threads_heartbeat.h \
threads_pmtud.h \
threads_send_recv.h
lib_LTLIBRARIES = libknet.la
libknet_la_SOURCES = $(sources)
libknet_la_CFLAGS = $(nss_CFLAGS)
-EXTRA_libknet_la_DEPENDENCIES = libknet.versions
+EXTRA_libknet_la_DEPENDENCIES = $(SYMFILE)
+
+libknet_la_LDFLAGS = -Wl,--version-script=$(srcdir)/$(SYMFILE) \
+ --export-dynamic \
+ -version-number $(libversion)
-libknet_la_LIBS = -version-info $(libversion)
-libknet_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libknet.versions
libknet_la_LIBADD = $(nss_LIBS) -lrt -lpthread -lm
diff --git a/libknet/libknet.versions b/libknet/libknet_exported_syms
similarity index 100%
rename from libknet/libknet.versions
rename to libknet/libknet_exported_syms
diff --git a/libtap/Makefile.am b/libtap/Makefile.am
index 978432e5..4a9d2357 100644
--- a/libtap/Makefile.am
+++ b/libtap/Makefile.am
@@ -1,45 +1,49 @@
#
# Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
#
# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
include $(top_srcdir)/build-aux/check.mk
-EXTRA_DIST = libtap_exported_sym tap_updown_bad tap_updown_good
+SYMFILE = libtap_exported_syms
+
+EXTRA_DIST = $(SYMFILE) tap_updown_bad tap_updown_good
sources = libtap.c
libversion = 0:0:0
# override global LIBS that pulls in lots of craft we don't need here
LIBS = -lpthread
include_HEADERS = libtap.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libtap.pc
lib_LTLIBRARIES = libtap.la
libtap_la_SOURCES = $(sources)
-libtap_la_LDFLAGS = -Wl,-version-script,$(srcdir)/libtap_exported_sym \
+EXTRA_libtap_la_DEPENDENCIES = $(SYMFILE)
+
+libtap_la_LDFLAGS = -Wl,-version-script,$(srcdir)/$(SYMFILE) \
--export-dynamic \
-version-number $(libversion)
TESTS = $(check_PROGRAMS)
noinst_PROGRAMS = $(check_PROGRAMS)
check_PROGRAMS = tap_test
tap_test_SOURCES = $(sources)
tap_test_CPPFLAGS = -DTEST \
-DABSBUILDDIR=\"$(abs_builddir)\"
diff --git a/libtap/libtap_exported_sym b/libtap/libtap_exported_syms
similarity index 100%
rename from libtap/libtap_exported_sym
rename to libtap/libtap_exported_syms

File Metadata

Mime Type
text/x-diff
Expires
Mon, Feb 24, 9:32 PM (13 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1460989
Default Alt Text
(3 KB)

Event Timeline