Skip to content

Commit

Permalink
fixup! fixup! Option to disable lua linking in shared libraries. Spec…
Browse files Browse the repository at this point in the history
…ial case for building embedded SILE.
  • Loading branch information
alerque committed Nov 2, 2023
1 parent 32f6380 commit 25a9ba1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 25 deletions.
8 changes: 4 additions & 4 deletions justenough/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ else
LIBTEXPDF_LIB = ../libtexpdf/libtexpdf.la
endif

AM_CFLAGS = $(WARNING_CFLAGS) -I ../libtexpdf
AM_CFLAGS = $(WARNING_CFLAGS) -I../libtexpdf
AM_LDFLAGS = -module -avoid-version $(UNDEFINED)

pkglib_LTLIBRARIES = compat-5.3.la
compat_5_3_la_SOURCES = compat-5.3.c
compat_5_3_la_SOURCES = compat-5.3.c compat-5.3.h
compat_5_3_la_LDFLAGS = $(AM_LDFLAGS)
compat_5_3_la_CFLAGS = $(AM_CFLAGS) $(LUA_INCLUDE)
compat_5_3_la_LIBADD = $(MY_LUA_LIB)

COMPAT53_CFLAGS = -I .libs -l:compat-5.3.a
COMPAT53_LIBADD = ./compat-5.3.la
COMPAT53_CFLAGS = -I./justenough/.libs/ -l:compat-5.3.a
# COMPAT53_LIBADD = ./compat-5.3.la

pkglib_LTLIBRARIES += justenoughharfbuzz.la
justenoughharfbuzz_la_SOURCES = justenoughharfbuzz.c hb-utils.c hb-utils.h compat-5.3.h
Expand Down
22 changes: 1 addition & 21 deletions src/embed.rs.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,7 @@ use std::str;

/// Embed everything that would otherwise be installed to datadir
#[derive(RustEmbed)]
#[folder = "."]
#[exclude = ".*"]
#[exclude = "*~"]
#[exclude = "*.in"]
#[exclude = "Make*"]
#[exclude = "autom4te.cache/*"]
#[exclude = "build-aux/*"]
#[exclude = "cmake/*"]
#[exclude = "completions/*"]
#[exclude = "documentation/*"]
#[exclude = "justenough/*"]
#[exclude = "libtexpdf/*"]
#[exclude = "libtexpdf/*"]
#[exclude = "libtool"]
#[exclude = "node_modules/*"]
#[exclude = "rust-toolchain"]
#[exclude = "sile*"]
#[exclude = "src/*"]
#[exclude = "target/*"]
#[exclude = "tests/*"]
// @INCLUDE_EMDED_INCLUDES@ -- this marker line gets replaced by a list of includes
#[folder = "hooks"]
pub struct SileModules;

// Link Lua loader functions from C modules that Lua would otherwise be loading externally that
Expand Down

0 comments on commit 25a9ba1

Please sign in to comment.