From 62ef80e7f87e206ac3532a0c893f3b80d7736ecc Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Sun, 6 Jan 2008 11:38:37 +0000 Subject: Add our version maps back --- src/.gitignore | 1 + src/lib.mk | 4 ++++ src/libeinfo/Makefile | 2 +- src/librc/Makefile | 1 + src/librc/rc.map | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/rc/rc.map | 58 --------------------------------------------------- 6 files changed, 65 insertions(+), 59 deletions(-) create mode 100644 src/librc/rc.map delete mode 100644 src/rc/rc.map diff --git a/src/.gitignore b/src/.gitignore index f0308601..f04dfe20 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -3,6 +3,7 @@ rc *.[oa] *.lo *.so +*.So *.so.* version.h diff --git a/src/lib.mk b/src/lib.mk index 947492c1..f98e25ce 100644 --- a/src/lib.mk +++ b/src/lib.mk @@ -30,11 +30,15 @@ INCMODE?= 0444 all: ${_LIBS} + + lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static library $@ ${AR} rc $@ $^ ${RANLIB} $@ +${SHLIB_NAME}: ${VERSION_MAP} +LDFLAGS+= -Wl,--version-script=${VERSION_MAP} ${SHLIB_NAME}: ${SOBJS} @${ECHO} building shared library $@ diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile index b6826340..5cace0cc 100644 --- a/src/libeinfo/Makefile +++ b/src/libeinfo/Makefile @@ -5,10 +5,10 @@ LIB= einfo SHLIB_MAJOR= 1 SRCS= libeinfo.c INCS= einfo.h +VERSION_MAP= einfo.map SHLIBDIR= /${LIBNAME} include $(TOPDIR)/cc.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/$(TERMCAP).mk - diff --git a/src/librc/Makefile b/src/librc/Makefile index d5ec7df8..722f4a31 100644 --- a/src/librc/Makefile +++ b/src/librc/Makefile @@ -5,6 +5,7 @@ LIB= rc SHLIB_MAJOR= 1 SRCS= librc.c librc-daemon.c librc-depend.c librc-misc.c librc-strlist.c INCS= rc.h +VERSION_MAP= rc.map CPPFLAGS+= -DLIB=\"${LIBNAME}\" LDADD+= ${LIBKVM} diff --git a/src/librc/rc.map b/src/librc/rc.map new file mode 100644 index 00000000..e5f8ee34 --- /dev/null +++ b/src/librc/rc.map @@ -0,0 +1,58 @@ +RC_1.0 { +global: + rc_config_list; + rc_config_load; + rc_config_value; + rc_deptree_depend; + rc_deptree_depends; + rc_deptree_free; + rc_deptree_load; + rc_deptree_order; + rc_deptree_update; + rc_deptree_update_needed; + rc_environ_fd; + rc_find_pids; + rc_runlevel_exists; + rc_runlevel_get; + rc_runlevel_list; + rc_runlevel_set; + rc_runlevel_starting; + rc_runlevel_stopping; + rc_service_add; + rc_service_daemons_crashed; + rc_service_daemon_set; + rc_service_delete; + rc_service_description; + rc_service_exists; + rc_service_in_runlevel; + rc_service_mark; + rc_service_options; + rc_service_plugable; + rc_service_resolve; + rc_service_schedule_clear; + rc_service_schedule_start; + rc_service_start; + rc_service_stop; + rc_services_in_runlevel; + rc_services_in_state; + rc_services_scheduled; + rc_services_scheduled_by; + rc_service_started_daemon; + rc_service_state; + rc_service_value_get; + rc_service_value_set; + rc_strcatpaths; + rc_strlist_add; + rc_strlist_addu; + rc_strlist_addsort; + rc_strlist_addsortc; + rc_strlist_addsortu; + rc_strlist_delete; + rc_strlist_free; + rc_strlist_join; + rc_strlist_reverse; + rc_yesno; + +local: + *; +}; diff --git a/src/rc/rc.map b/src/rc/rc.map deleted file mode 100644 index e5f8ee34..00000000 --- a/src/rc/rc.map +++ /dev/null @@ -1,58 +0,0 @@ -RC_1.0 { -global: - rc_config_list; - rc_config_load; - rc_config_value; - rc_deptree_depend; - rc_deptree_depends; - rc_deptree_free; - rc_deptree_load; - rc_deptree_order; - rc_deptree_update; - rc_deptree_update_needed; - rc_environ_fd; - rc_find_pids; - rc_runlevel_exists; - rc_runlevel_get; - rc_runlevel_list; - rc_runlevel_set; - rc_runlevel_starting; - rc_runlevel_stopping; - rc_service_add; - rc_service_daemons_crashed; - rc_service_daemon_set; - rc_service_delete; - rc_service_description; - rc_service_exists; - rc_service_in_runlevel; - rc_service_mark; - rc_service_options; - rc_service_plugable; - rc_service_resolve; - rc_service_schedule_clear; - rc_service_schedule_start; - rc_service_start; - rc_service_stop; - rc_services_in_runlevel; - rc_services_in_state; - rc_services_scheduled; - rc_services_scheduled_by; - rc_service_started_daemon; - rc_service_state; - rc_service_value_get; - rc_service_value_set; - rc_strcatpaths; - rc_strlist_add; - rc_strlist_addu; - rc_strlist_addsort; - rc_strlist_addsortc; - rc_strlist_addsortu; - rc_strlist_delete; - rc_strlist_free; - rc_strlist_join; - rc_strlist_reverse; - rc_yesno; - -local: - *; -}; -- cgit v1.2.3