root/xz
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2025-02-22 08:28:25 +00:00
Code Issues Releases Wiki Activity

Build: Fix out-of-tree builds when using the replacement getopt_long

Browse Source 
Nowaways $(top_builddir)/lib/getopt.h depends on headers in
$(top_srcdir)/lib, so both have to be in the include path.
CMake-based build already did this.

Fixes: 7e884c00d0093c38339f17fb1d280eec493f42ca
This commit is contained in:
Lasse Collin 2025-02-17 21:46:15 +02:00
parent 41322b2c60
commit 2eaf242c56
No known key found for this signature in database
GPG Key ID: 38EE757D69184620
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lzmainfo/Makefile.am
View File

@ -18,12 +18,14 @@ endif
lzmainfo_CPPFLAGS = \ lzmainfo_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \ -DLOCALEDIR=\"$(localedir)\" \
-I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api
-I$(top_builddir)/lib
lzmainfo_LDADD = $(top_builddir)/src/liblzma/liblzma.la lzmainfo_LDADD = $(top_builddir)/src/liblzma/liblzma.la
if COND_GNULIB if COND_GNULIB
lzmainfo_CPPFLAGS += \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
lzmainfo_LDADD += $(top_builddir)/lib/libgnu.a lzmainfo_LDADD += $(top_builddir)/lib/libgnu.a
endif endif

6
src/xz/Makefile.am
View File

@ -50,12 +50,14 @@ endif
xz_CPPFLAGS = \ xz_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \ -DLOCALEDIR=\"$(localedir)\" \
-I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api
-I$(top_builddir)/lib
xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la
if COND_GNULIB if COND_GNULIB
xz_CPPFLAGS += \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
xz_LDADD += $(top_builddir)/lib/libgnu.a xz_LDADD += $(top_builddir)/lib/libgnu.a
endif endif

6
src/xzdec/Makefile.am
View File

@ -21,11 +21,13 @@ endif
xzdec_CPPFLAGS = \ xzdec_CPPFLAGS = \
-DTUKLIB_GETTEXT=0 \ -DTUKLIB_GETTEXT=0 \
-I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api
-I$(top_builddir)/lib
xzdec_LDADD = $(top_builddir)/src/liblzma/liblzma.la xzdec_LDADD = $(top_builddir)/src/liblzma/liblzma.la
if COND_GNULIB if COND_GNULIB
xzdec_CPPFLAGS += \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
xzdec_LDADD += $(top_builddir)/lib/libgnu.a xzdec_LDADD += $(top_builddir)/lib/libgnu.a
endif endif