Skip to content

Commit

Permalink
chore(build): Explictly specify order of library builds to avoid races
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Sep 27, 2023
1 parent 17d1691 commit c2fc190
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ ACLOCAL_AMFLAGS = -I build-aux
.SECONDEXPANSION:
.DELETE_ON_ERROR:

SUBDIRS = justenough
SUBDIRS =
if !SYSTEM_LIBTEXPDF
SUBDIRS += libtexpdf
endif
SUBDIRS += justenough .

docdir = $(datarootdir)/doc/$(TRANSFORMED_PACKAGE_NAME)
licensedir = $(datarootdir)/licenses/$(TRANSFORMED_PACKAGE_NAME)
Expand Down
8 changes: 5 additions & 3 deletions justenough/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ if SYSTEM_LIBTEXPDF
LIBTEXPDF_LIB=-ltexpdf
else
LIBTEXPDF_LIB=../libtexpdf/libtexpdf.la
$(LIBTEXPDF_LIB):
make -C ../libtexpdf all
endif

pkglib_LTLIBRARIES = justenoughharfbuzz.la justenoughlibtexpdf.la justenoughfontconfig.la fontmetrics.la svg.la
pkglib_LTLIBRARIES = justenoughharfbuzz.la
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)

pkglib_LTLIBRARIES += justenoughfontconfig.la
justenoughfontconfig_la_SOURCES = justenoughfontconfig.c silewin32.h
justenoughfontconfig_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
justenoughfontconfig_la_CFLAGS = $(FONTCONFIG_CFLAGS) $(LUA_INCLUDE)
Expand All @@ -35,16 +34,19 @@ macfonts_la_OBJCFLAGS = -U VERSION $(HARFBUZZ_CFLAGS) $(LUA_INCLUDE) -fmodules
macfonts_la_LIBADD = $(HARFBUZZ_LIBS) $(MY_LUA_LIB)
endif

pkglib_LTLIBRARIES += justenoughlibtexpdf.la
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)

pkglib_LTLIBRARIES += fontmetrics.la
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)

pkglib_LTLIBRARIES += svg.la
svg_la_SOURCES = svg.c nanosvg.h
svg_la_LDFLAGS = -module -avoid-version -shared $(UNDEFINED)
svg_la_CFLAGS = $(LUA_INCLUDE)
Expand Down

0 comments on commit c2fc190

Please sign in to comment.