mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
Get rid of no-NLS gnulib. I don't know how to get it
working with Automake. People who want smaller lzmadec should use --disable-nls on non-GNU systems.
This commit is contained in:
parent
ce8b036a6c
commit
5286723e0d
3 changed files with 5 additions and 11 deletions
|
@ -15,19 +15,11 @@
|
||||||
|
|
||||||
## Not using gnulib-tool, at least for now. Less mess this way.
|
## Not using gnulib-tool, at least for now. Less mess this way.
|
||||||
|
|
||||||
## We need two builds of libgnu: one with NLS and one without.
|
noinst_LIBRARIES = libgnu.a
|
||||||
## This is because lzma uses NLS but lzmadec doesn't, while
|
|
||||||
## both need GNU getopt_long().
|
|
||||||
noinst_LIBRARIES = libgnu.a libgnu_nls.a
|
|
||||||
|
|
||||||
libgnu_a_SOURCES =
|
libgnu_a_SOURCES =
|
||||||
libgnu_a_DEPENDENCIES = $(LIBOBJS)
|
libgnu_a_DEPENDENCIES = $(LIBOBJS)
|
||||||
libgnu_a_LIBADD = $(LIBOBJS)
|
libgnu_a_LIBADD = $(LIBOBJS)
|
||||||
libgnu_a_CPPFLAGS = -DDISABLE_NLS=1
|
|
||||||
|
|
||||||
libgnu_nls_a_SOURCES =
|
|
||||||
libgnu_nls_a_DEPENDENCIES = $(LIBOBJS)
|
|
||||||
libgnu_nls_a_LIBADD = $(LIBOBJS)
|
|
||||||
|
|
||||||
EXTRA_DIST = gettext.h getopt_.h getopt.c getopt1.c getopt_int.h
|
EXTRA_DIST = gettext.h getopt_.h getopt.c getopt1.c getopt_int.h
|
||||||
BUILT_SOURCES = $(GETOPT_H)
|
BUILT_SOURCES = $(GETOPT_H)
|
||||||
|
|
|
@ -59,5 +59,5 @@ lzma_LDADD = \
|
||||||
@PTHREAD_LIBS@
|
@PTHREAD_LIBS@
|
||||||
|
|
||||||
if COND_GNULIB
|
if COND_GNULIB
|
||||||
lzma_LDADD += @top_builddir@/lib/libgnu_nls.a
|
lzma_LDADD += @top_builddir@/lib/libgnu.a
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -20,7 +20,9 @@ lzmadec_CPPFLAGS = \
|
||||||
-I@top_srcdir@/src/liblzma/api \
|
-I@top_srcdir@/src/liblzma/api \
|
||||||
-I@top_builddir@/lib
|
-I@top_builddir@/lib
|
||||||
lzmadec_LDFLAGS = -static
|
lzmadec_LDFLAGS = -static
|
||||||
lzmadec_LDADD = @top_builddir@/src/liblzma/liblzma.la
|
lzmadec_LDADD = \
|
||||||
|
@top_builddir@/src/liblzma/liblzma.la \
|
||||||
|
@LTLIBINTL@
|
||||||
|
|
||||||
if COND_GNULIB
|
if COND_GNULIB
|
||||||
lzmadec_LDADD += @top_builddir@/lib/libgnu.a
|
lzmadec_LDADD += @top_builddir@/lib/libgnu.a
|
||||||
|
|
Loading…
Reference in a new issue