Skip to content

Commit

Permalink
fix(build): Stop copying libraries places autotools doesn't normaly h…
Browse files Browse the repository at this point in the history
…andle them
  • Loading branch information
alerque committed Sep 26, 2023
1 parent d22ea34 commit 0f9cf84
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 2 additions & 0 deletions core/pathsetup.lua.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
if "@LUA_PATH@" ~= "" then
package.path = "@LUA_PATH@"
package.cpath = "@LUA_CPATH@"
package.cpath = package.cpath .. ";./libtexpdf/.libs/?.so"
package.cpath = package.cpath .. ";./justenough/.libs/?.so"
end

local executable = debug.getinfo(3, "S").source
Expand Down
10 changes: 0 additions & 10 deletions justenough/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,49 +19,39 @@ justenoughharfbuzz_la_SOURCES = justenoughharfbuzz.c hb-utils.c hb-utils.h
justenoughharfbuzz_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
justenoughharfbuzz_la_CFLAGS = $(HARFBUZZ_CFLAGS) $(HARFBUZZ_SUBSET_CFLAGS) $(LUA_INCLUDE)
justenoughharfbuzz_la_LIBADD = $(HARFBUZZ_LIBS) $(HARFBUZZ_SUBSET_LIBS) $(MY_LUA_LIB)
to_copy = .libs/justenoughharfbuzz.@SHARED_LIB_EXT@

justenoughfontconfig_la_SOURCES = justenoughfontconfig.c silewin32.h
justenoughfontconfig_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
justenoughfontconfig_la_CFLAGS = $(FONTCONFIG_CFLAGS) $(LUA_INCLUDE)
justenoughfontconfig_la_LIBADD = $(FONTCONFIG_LIBS) $(MY_LUA_LIB)
to_copy += .libs/justenoughfontconfig.@SHARED_LIB_EXT@

if APPKIT
pkglib_LTLIBRARIES += macfonts.la
macfonts_la_SOURCES = macfonts.m
macfonts_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
macfonts_la_OBJCFLAGS = -U VERSION $(HARFBUZZ_CFLAGS) $(LUA_INCLUDE) -fmodules
macfonts_la_LIBADD = $(HARFBUZZ_LIBS) $(MY_LUA_LIB)
to_copy += .libs/macfonts.@SHARED_LIB_EXT@
endif

justenoughlibtexpdf_la_SOURCES = justenoughlibtexpdf.c imagebbox.c
justenoughlibtexpdf_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
justenoughlibtexpdf_la_CFLAGS = -I.. $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES) $(LUA_INCLUDE)
justenoughlibtexpdf_la_LIBADD = $(LIBTEXPDF_LIB) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS) $(MY_LUA_LIB)
to_copy += .libs/justenoughlibtexpdf.@SHARED_LIB_EXT@

fontmetrics_la_SOURCES = fontmetrics.c hb-utils.c hb-utils.h
fontmetrics_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
fontmetrics_la_CFLAGS = $(LUA_INCLUDE) $(HARFBUZZ_CFLAGS)
fontmetrics_la_LIBADD = $(MY_LUA_LIB) $(HARFBUZZ_LIBS)
to_copy += .libs/fontmetrics.@SHARED_LIB_EXT@

svg_la_SOURCES = svg.c nanosvg.h
svg_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
svg_la_CFLAGS = $(LUA_INCLUDE)
svg_la_LIBADD = $(MY_LUA_LIB)
to_copy += .libs/svg.@SHARED_LIB_EXT@

if ICU
pkglib_LTLIBRARIES += justenoughicu.la
justenoughicu_la_SOURCES = justenoughicu.c
justenoughicu_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
justenoughicu_la_CFLAGS = -I.. $(ICU_CFLAGS) $(LUA_INCLUDE)
justenoughicu_la_LIBADD = $(ICU_LIBS) $(MY_LUA_LIB)
to_copy += .libs/justenoughicu.@SHARED_LIB_EXT@
endif

all-local: $(pkglib_LTLIBRARIES)
cp $(to_copy) ..

0 comments on commit 0f9cf84

Please sign in to comment.