[prev in list] [next in list] [prev in thread] [next in thread] 

List:       libverto-commits
Subject:    [libverto] use symbol list files for building
From:       npmccallum () fedoraproject ! org (Nathaniel McCallum)
Date:       2012-08-25 4:55:32
Message-ID: 20120825045532.B29BE23ED () hosted02 ! fedoraproject ! org
[Download RAW message or body]

commit 301c649ecd765d5257c549e3c6a455fa71475fed
Author: Nathaniel McCallum <npmccallum at redhat.com>
Date:   Sat Aug 25 00:21:25 2012 -0400

    use symbol list files for building

 src/Makefile.am               |   29 +++++++++++++++--------------
 src/libverto-glib.symbols     |    4 ++++
 src/libverto-libev.symbols    |    4 ++++
 src/libverto-libevent.symbols |    4 ++++
 src/libverto-tevent.symbols   |    4 ++++
 src/libverto.symbols          |   32 ++++++++++++++++++++++++++++++++
 6 files changed, 63 insertions(+), 14 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d23923..05dd6f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,6 @@
-LIBVERTO_CURRENT=1
-LIBVERTO_REVISION=0
-LIBVERTO_AGE=0
+VERSION_INFO = -version-info 1:0:0
 
 AM_CFLAGS = -Wall -Wdeclaration-after-statement
-AM_LDFLAGS = -export-symbols-regex '^verto_' -version-info \
-               $(LIBVERTO_CURRENT):$(LIBVERTO_REVISION):$(LIBVERTO_AGE)
 
 include_HEADERS     = verto.h verto-module.h
 noinst_HEADERS      = module.h
@@ -12,16 +8,18 @@ lib_LTLIBRARIES     = libverto.la
 
 libverto_la_SOURCES = verto.c module.c verto.h
 libverto_la_CFLAGS  = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-libverto_la_LDFLAGS = $(AM_LDFLAGS) $(LIBS) $(PTHREAD_LIBS)
+libverto_la_LDFLAGS = $(VERSION_INFO) $(LIBS) $(PTHREAD_LIBS) \
+                        -export-symbols $(srcdir)/libverto.symbols
 
 # glib
 if BUILD_GLIB
 lib_LTLIBRARIES += libverto-glib.la
 include_HEADERS += verto-glib.h
 libverto_glib_la_SOURCES  = verto-glib.c
-libverto_glib_la_CFLAGS   = $(AM_CFLAGS)  $(GLIB_CFLAGS)
-libverto_glib_la_LDFLAGS  = $(AM_LDFLAGS) $(GLIB_LIBS)
 libverto_glib_la_LIBADD   = libverto.la
+libverto_glib_la_CFLAGS   = $(AM_CFLAGS) $(GLIB_CFLAGS)
+libverto_glib_la_LDFLAGS  = $(VERSION_INFO) $(GLIB_LIBS) \
+                            -export-symbols $(srcdir)/libverto-glib.symbols
 endif
 
 # libev
@@ -29,9 +27,10 @@ if BUILD_LIBEV
 lib_LTLIBRARIES += libverto-libev.la
 include_HEADERS += verto-libev.h
 libverto_libev_la_SOURCES = verto-libev.c
-libverto_libev_la_CFLAGS  = $(AM_CFLAGS)  $(LIBEV_CFLAGS)
-libverto_libev_la_LDFLAGS = $(AM_LDFLAGS) $(LIBEV_LIBS)
 libverto_libev_la_LIBADD  = libverto.la
+libverto_libev_la_CFLAGS  = $(AM_CFLAGS) $(LIBEV_CFLAGS)
+libverto_libev_la_LDFLAGS = $(VERSION_INFO) $(LIBEV_LIBS) \
+                            -export-symbols $(srcdir)/libverto-libev.symbols
 endif
 
 # libevent
@@ -39,9 +38,10 @@ if BUILD_LIBEVENT
 lib_LTLIBRARIES += libverto-libevent.la
 include_HEADERS += verto-libevent.h
 libverto_libevent_la_SOURCES = verto-libevent.c
-libverto_libevent_la_CFLAGS  = $(AM_CFLAGS)  $(LIBEVENT_CFLAGS)
-libverto_libevent_la_LDFLAGS = $(AM_LDFLAGS) $(LIBEVENT_LIBS)
 libverto_libevent_la_LIBADD  = libverto.la
+libverto_libevent_la_CFLAGS  = $(AM_CFLAGS) $(LIBEVENT_CFLAGS)
+libverto_libevent_la_LDFLAGS = $(VERSION_INFO) $(LIBEVENT_LIBS) \
+                               -export-symbols $(srcdir)/libverto-libevent.symbols
 endif
 
 # tevent
@@ -49,7 +49,8 @@ if BUILD_TEVENT
 lib_LTLIBRARIES += libverto-tevent.la
 include_HEADERS += verto-tevent.h
 libverto_tevent_la_SOURCES = verto-tevent.c
-libverto_tevent_la_CFLAGS  = $(AM_CFLAGS)  $(TEVENT_CFLAGS)
-libverto_tevent_la_LDFLAGS = $(AM_LDFLAGS) $(TEVENT_LIBS)
 libverto_tevent_la_LIBADD  = libverto.la
+libverto_tevent_la_CFLAGS  = $(AM_CFLAGS) $(TEVENT_CFLAGS)
+libverto_tevent_la_LDFLAGS = $(VERSION_INFO) $(TEVENT_LIBS) \
+                             -export-symbols $(srcdir)/libverto-tevent.symbols
 endif
diff --git a/src/libverto-glib.symbols b/src/libverto-glib.symbols
new file mode 100644
index 0000000..bcc3aff
--- /dev/null
+++ b/src/libverto-glib.symbols
@@ -0,0 +1,4 @@
+verto_convert_glib
+verto_default_glib
+verto_module_table_glib
+verto_new_glib
diff --git a/src/libverto-libev.symbols b/src/libverto-libev.symbols
new file mode 100644
index 0000000..250d339
--- /dev/null
+++ b/src/libverto-libev.symbols
@@ -0,0 +1,4 @@
+verto_convert_libev
+verto_default_libev
+verto_module_table_libev
+verto_new_libev
diff --git a/src/libverto-libevent.symbols b/src/libverto-libevent.symbols
new file mode 100644
index 0000000..178a350
--- /dev/null
+++ b/src/libverto-libevent.symbols
@@ -0,0 +1,4 @@
+verto_convert_libevent
+verto_default_libevent
+verto_module_table_libevent
+verto_new_libevent
diff --git a/src/libverto-tevent.symbols b/src/libverto-tevent.symbols
new file mode 100644
index 0000000..063d668
--- /dev/null
+++ b/src/libverto-tevent.symbols
@@ -0,0 +1,4 @@
+verto_convert_tevent
+verto_default_tevent
+verto_module_table_tevent
+verto_new_tevent
diff --git a/src/libverto.symbols b/src/libverto.symbols
new file mode 100644
index 0000000..ecba76a
--- /dev/null
+++ b/src/libverto.symbols
@@ -0,0 +1,32 @@
+verto_add_child
+verto_add_idle
+verto_add_io
+verto_add_signal
+verto_add_timeout
+verto_break
+verto_convert_module
+verto_default
+verto_del
+verto_fire
+verto_free
+verto_get_ctx
+verto_get_fd
+verto_get_fd_state
+verto_get_flags
+verto_get_interval
+verto_get_private
+verto_get_proc
+verto_get_proc_status
+verto_get_signal
+verto_get_supported_types
+verto_get_type
+verto_new
+verto_reinitialize
+verto_run
+verto_run_once
+verto_set_allocator
+verto_set_default
+verto_set_fd_state
+verto_set_flags
+verto_set_private
+verto_set_proc_status

[prev in list] [next in list] [prev in thread] [next in thread]