norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: link libuterm statically

Browse Source 
We shouldn't export libraries which we don't really allow linkink
externally. Link libuterm statically and avoid installing it into /lib.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann 2013-10-29 10:19:05 +01:00
parent 527ef20fb8
commit 6ef8db0790
4 changed files with 4 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile.am
View File

@ -11,10 +11,6 @@ LIBELOOP_CURRENT = 1
LIBELOOP_REVISION = 0
LIBELOOP_AGE = 0
LIBUTERM_CURRENT = 1
LIBUTERM_REVISION = 0
LIBUTERM_AGE = 0
#
# Global Configurations and Initializations
#
@ -36,9 +32,7 @@ EXTRA_DIST = \
docs/kmscon.service \
docs/kmsconvt@.service \
docs/pc/libeloop.pc.in \
docs/pc/libuterm.pc.in \
docs/sym/libeloop.sym \
docs/sym/libuterm.sym
docs/sym/libeloop.sym
CLEANFILES =
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
@ -238,15 +232,7 @@ endif
# abstractions and an input layer
#
if BUILD_ENABLE_UTERM
lib_LTLIBRARIES += libuterm.la
include_HEADERS += \
src/uterm_input.h \
src/uterm_monitor.h \
src/uterm_video.h \
src/uterm_vt.h
pkgconfig_DATA += docs/pc/libuterm.pc
endif
noinst_LTLIBRARIES += libuterm.la
libuterm_la_SOURCES = \
src/uterm_input.h \
@ -271,11 +257,8 @@ libuterm_la_LIBADD = \
$(XKBCOMMON_LIBS) \
libeloop.la \
libshl.la
EXTRA_libuterm_la_DEPENDENCIES = ${top_srcdir}/docs/sym/libuterm.sym
libuterm_la_LDFLAGS = \
$(AM_LDFLAGS) \
-version-info $(LIBUTERM_CURRENT):$(LIBUTERM_REVISION):$(LIBUTERM_AGE) \
-Wl,--version-script="$(top_srcdir)/docs/sym/libuterm.sym"
$(AM_LDFLAGS)
if BUILD_ENABLE_MULTI_SEAT
libuterm_la_SOURCES += src/uterm_systemd.c

43
configure.ac
View File

@ -138,18 +138,6 @@ elif test "x$enable_eloop" = "x" ; then
fi
AC_MSG_RESULT([$enable_eloop])
# uterm
AC_MSG_CHECKING([whether user wants uterm])
AC_ARG_ENABLE([uterm],
[AS_HELP_STRING([--enable-uterm],
[build uterm library])])
if test "x$enable_all" = "xyes" ; then
enable_uterm="yes"
elif test "x$enable_uterm" = "x" ; then
enable_uterm="no (default)"
fi
AC_MSG_RESULT([$enable_uterm])
# kmscon
AC_MSG_CHECKING([whether user wants kmscon])
AC_ARG_ENABLE([kmscon],
@ -480,15 +468,6 @@ else
video_drm3d_missing="enable-video-drm3d"
fi
# uterm
uterm_avail=no
uterm_missing=""
if test ! "x$enable_uterm" = "xno" ; then
uterm_avail=yes
else
uterm_missing="enable-uterm"
fi
# multi-seat
multi_seat_avail=no
multi_seat_missing=""
@ -645,11 +624,6 @@ if test ! "x$enable_kmscon" = "xno" ; then
kmscon_missing="libtsm,$kmscon_missing"
fi
if test "x$uterm_avail" = "xno" ; then
kmscon_avail=no
kmscon_missing="$uterm_missing,$kmscon_missing"
fi
if test "x$kmscon_avail" = "xno" ; then
if test "x$enable_kmscon" = "xyes" ; then
AC_ERROR([missing for kmscon: $kmscon_missing])
@ -673,7 +647,6 @@ if test "x$kmscon_avail" = "xyes" ; then
if test "x${enable_kmscon% *}" = "xyes" ; then
kmscon_enabled=yes
enable_eloop=yes
enable_uterm=yes
fi
fi
@ -749,14 +722,6 @@ if test "x$multi_seat_avail" = "xyes" ; then
fi
fi
# uterm
uterm_enabled=no
if test "x$uterm_avail" = "xyes" ; then
if test "x${enable_uterm% *}" = "xyes" ; then
uterm_enabled=yes
fi
fi
# video drm3d
video_drm3d_enabled=no
if test "x$video_drm3d_avail" = "xyes" ; then
@ -870,10 +835,6 @@ fi
AM_CONDITIONAL([BUILD_ENABLE_VIDEO_DRM3D],
[test "x$video_drm3d_enabled" = "xyes"])
# uterm
AM_CONDITIONAL([BUILD_ENABLE_UTERM],
[test "x$uterm_enabled" = "xyes"])
# multi-seat
if test "x$multi_seat_enabled" = "xyes" ; then
AC_DEFINE([BUILD_ENABLE_MULTI_SEAT], [1],
@ -1021,8 +982,7 @@ fi
#
AC_CONFIG_FILES([Makefile
docs/pc/libeloop.pc
docs/pc/libuterm.pc])
docs/pc/libeloop.pc])
AC_OUTPUT
#
@ -1040,7 +1000,6 @@ AC_MSG_NOTICE([Build configuration:
Applications and Libraries:
kmscon: $kmscon_enabled ($kmscon_avail: $kmscon_missing)
uterm: $uterm_enabled ($uterm_avail: $uterm_missing)
eloop: $eloop_enabled ($eloop_avail: $eloop_missing)
Miscellaneous Options:

11
docs/pc/libuterm.pc.in
View File

@ -1,11 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: uterm
Description: User-space Terminal Video/Input/Hotplug/etc Helper Library
URL: @PACKAGE_URL@
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -luterm
Cflags: -I${includedir}

125
docs/sym/libuterm.sym
View File

@ -1,125 +0,0 @@
/***
* libuterm - User-Space Terminals
*
* Copyright (c) 2012-2013 David Herrmann <dh.herrmann@googlemail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
***/
LIBUTERM_1 {
global:
uterm_input_new;
uterm_input_ref;
uterm_input_unref;
uterm_input_add_dev;
uterm_input_remove_dev;
uterm_input_register_cb;
uterm_input_unregister_cb;
uterm_input_sleep;
uterm_input_wake_up;
uterm_input_is_awake;
uterm_vt_master_new;
uterm_vt_master_ref;
uterm_vt_master_unref;
uterm_vt_master_activate_all;
uterm_vt_master_deactivate_all;
uterm_vt_allocate;
uterm_vt_deallocate;
uterm_vt_ref;
uterm_vt_unref;
uterm_vt_activate;
uterm_vt_deactivate;
uterm_vt_retry;
uterm_vt_get_type;
uterm_vt_get_num;
uterm_dpms_to_name;
uterm_video_available;
uterm_mode_ref;
uterm_mode_unref;
uterm_mode_next;
uterm_mode_get_name;
uterm_mode_get_width;
uterm_mode_get_height;
uterm_display_ref;
uterm_display_unref;
uterm_display_next;
uterm_display_register_cb;
uterm_display_unregister_cb;
uterm_display_get_modes;
uterm_display_get_current;
uterm_display_get_default;
uterm_display_get_state;
uterm_display_activate;
uterm_display_deactivate;
uterm_display_set_dpms;
uterm_display_get_dpms;
uterm_display_use;
uterm_display_get_buffers;
uterm_display_swap;
uterm_display_is_swapping;
uterm_display_fill;
uterm_display_blit;
uterm_display_fake_blend;
uterm_display_fake_blendv;
uterm_video_new;
uterm_video_ref;
uterm_video_unref;
uterm_video_segfault;
uterm_video_get_displays;
uterm_video_register_cb;
uterm_video_unregister_cb;
uterm_video_sleep;
uterm_video_wake_up;
uterm_video_is_awake;
uterm_video_poll;
UTERM_VIDEO_FBDEV;
UTERM_VIDEO_DRM2D;
UTERM_VIDEO_DRM3D;
uterm_monitor_new;
uterm_monitor_ref;
uterm_monitor_unref;
uterm_monitor_scan;
uterm_monitor_set_seat_data;
uterm_monitor_set_dev_data;
local:
*;
};