From d2a2a3db2691a7ba88a8f4fba5693d60c4da13c8 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sun, 6 May 2018 14:29:22 +0100 Subject: [PATCH] fix liblz4 cflags --- Makefile.am | 12 ++++++++---- configure.ac | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4970639..43da725 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,14 +13,18 @@ elf2kip_SOURCES = src/elf2kip.c src/cJSON.c src/cJSON.h src/blz.c src/blz.h src/ nacptool_SOURCES = src/nacptool.c -npdmtool_SOURCES = src/npdmtool.c src/cJSON.c src/cJSON.h +npdmtool_SOURCES = src/npdmtool.c src/cJSON.c src/cJSON.h nxlink_SOURCES = src/nxlink.c nxlink_CPPFLAGS = @ZLIB_CFLAGS@ - -elf2nso_LDADD = @LZ4_LIBS@ - nxlink_LDADD = @ZLIB_LIBS@ @NET_LIBS@ +elf2nso_CPPFLAGS = @LZ4_CFLAGS@ +elf2nso_LDADD = @LZ4_LIBS@ + +elf2nro_CPPFLAGS = @LZ4_CFLAGS@ +elf2nro_LDADD = @LZ4_LIBS@ + + EXTRA_DIST = autogen.sh diff --git a/configure.ac b/configure.ac index 6a64267..bd42364 100644 --- a/configure.ac +++ b/configure.ac @@ -36,9 +36,10 @@ esac CFLAGS="$CFLAGS -std=gnu99" +AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) AC_SUBST(NET_LIBS) -AC_SUBST(ZLIB_CFLAGS) +AC_SUBST(LZ4_CFLAGS) AC_SUBST(LZ4_LIBS) AC_CONFIG_FILES([Makefile]) AC_OUTPUT