Skip to content
Snippets Groups Projects
Commit d12e1a48 authored by Simon McVittie's avatar Simon McVittie
Browse files

Update code-generation

parent 6f59a685
Branches
Tags
1 merge request!311Build capsule-capture-libs from a bundled copy of libcapsule
...@@ -10,17 +10,11 @@ ...@@ -10,17 +10,11 @@
/aclocal.m4 /aclocal.m4
/autom4te.cache/ /autom4te.cache/
/capsule-shim.mk /capsule-shim.mk
/compile
/config.guess
/config.log /config.log
/config.status /config.status
/config.sub
/configure /configure
/depcomp
/install-sh
/libtool /libtool
/ltmain.sh
/m4/ /m4/
/missing
/preconfigure.log /preconfigure.log
/shim/*.so.c /shim/*.so.*.c
/shim/*.so.*.map
CAPSULE_LIBRARY := GL AUTOMAKE_OPTIONS = subdir-objects
CAPSULE_VERSION := 1 ACLOCAL_AMFLAGS = -I m4
CAPSULE_MAJOR := 1 AM_CFLAGS = -std=c99 -D_GNU_SOURCE -Wall -Werror
AM_CFLAGS += $(CAPSULE_CFLAGS)
CAPSULE_SONAMES := libGL.so.1
CAPSULE_VERSION_libGL.so.1 := 1
#AM_CAPSULE_MKSTUBLIB_FLAGS := --ext-dlopen --ext-dlsym #AM_CAPSULE_MKSTUBLIB_FLAGS := --ext-dlopen --ext-dlsym
lib_LTLIBRARIES = libGL.la
nodist_libGL_la_SOURCES = shim/libGL.so.1.c
libGL_la_LDFLAGS = $(shim_ldflags_libGL.so.1)
libGL_la_LIBADD = $(CAPSULE_LIBS)
CLEANFILES = $(nodist_libGL_la_SOURCES) \
$(nodist_libGL_la_SOURCES:.c=.map)
BUILT_SOURCES = $(nodist_libGL_la_SOURCES)
include @CAPSULE_MKINC@/disabled.mk include @CAPSULE_MKINC@/disabled.mk
include capsule-shim.mk include @CAPSULE_MKINC@/capsule-shim.mk
...@@ -16,7 +16,7 @@ of the excluded library to shim/libGL.so.c.excluded and rebuild. ...@@ -16,7 +16,7 @@ of the excluded library to shim/libGL.so.c.excluded and rebuild.
The generated library will have the same name as the main proxy target The generated library will have the same name as the main proxy target
(libGL.so.1). You can control the exact version number (cf libfoo.x.y.z) (libGL.so.1). You can control the exact version number (cf libfoo.x.y.z)
by setting CAPSULE_VERSION in Makefile.am by setting CAPSULE_VERSION_libGL.so.1 in Makefile.am
To make the generated library override dlopen() and/or dlsym() for To make the generated library override dlopen() and/or dlsym() for
callers outside the capsule, pass --ext-dlopen and/or --ext-dlsym to callers outside the capsule, pass --ext-dlopen and/or --ext-dlsym to
......
AC_PREREQ([2.60])
AC_INIT([libgl-proxy], [1]) AC_INIT([libgl-proxy], [1])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
dnl basename of the main library we are proxying for:
AC_SUBST([LIB],[GL])
AC_SUBST([MAJ],[1])
dnl don't kvetch about gnu makefile syntax dnl don't kvetch about gnu makefile syntax
dnl and don't require ChangeLog &co if they don't exist dnl and don't require ChangeLog &co if they don't exist
AM_INIT_AUTOMAKE([-Wno-portability foreign]) AM_INIT_AUTOMAKE([-Wno-portability foreign])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
LT_INIT LT_INIT
PKG_CHECK_MODULES([CAPSULE], [capsule]) PKG_CHECK_MODULES([CAPSULE], [capsule])
...@@ -36,5 +38,5 @@ AS_CASE([$with_search_tree], ...@@ -36,5 +38,5 @@ AS_CASE([$with_search_tree],
[AC_MSG_ERROR([--with-search-tree requires an absolute path argument])]) [AC_MSG_ERROR([--with-search-tree requires an absolute path argument])])
AC_SUBST([CAPSULE_SEARCH_TREE], [$with_search_tree]) AC_SUBST([CAPSULE_SEARCH_TREE], [$with_search_tree])
AC_CONFIG_FILES([capsule-shim.mk:$CAPSULE_MKINC/capsule-shim.mk.in Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT() AC_OUTPUT
This diff is collapsed.
libc.so.6
libdl.so.2
libm.so.6
libpthread.so.0
libX11-xcb.so.1
libX11.so.6
libxcb-dri2.so.0
libxcb-dri3.so.0
libxcb-glx.so.0
libxcb-present.so.0
libxcb-sync.so.1
libxcb.so.1
libX11-xcb.so.1
libX11.so.6
libxcb-dri2.so.0
libxcb-dri3.so.0
libxcb-glx.so.0
libxcb-present.so.0
libxcb-sync.so.1
libxcb.so.1
libX11-xcb.so.1
libX11.so.6
libxcb-dri2.so.0
libxcb-dri3.so.0
libxcb-glx.so.0
libxcb-present.so.0
libxcb-sync.so.1
libxcb.so.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment