>From d25b8f213fd4b09d67a94d068ed269f5c1b83954 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Tue, 23 Feb 2010 11:32:53 +0000 Subject: [PATCH 1/2] Link gnulib in to the hivex library, not end-user programs. Gnulib should be statically linked into the hivex library, so it gets included into end-user programs automatically. Otherwise end-user programs would have to link explicitly with gnulib. --- hivex/Makefile.am | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hivex/Makefile.am b/hivex/Makefile.am index 01501aa..e17f5a3 100644 --- a/hivex/Makefile.am +++ b/hivex/Makefile.am @@ -38,6 +38,7 @@ libhivex_la_SOURCES = \ byte_conversions.h \ gettext.h +libhivex_la_LIBADD = ../gnulib/lib/libgnu.la libhivex_la_LDFLAGS = -version-info 0:0:0 $(LTLIBINTL) $(LTLIBTHREAD) libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib @@ -49,7 +50,7 @@ noinst_SCRIPTS = example1 example2 example3 example4 example5 example6 hivexml_SOURCES = \ hivexml.c -hivexml_LDADD = libhivex.la $(LIBXML2_LIBS) ../gnulib/lib/libgnu.la +hivexml_LDADD = libhivex.la $(LIBXML2_LIBS) hivexml_CFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ $(LIBXML2_CFLAGS) \ @@ -60,7 +61,7 @@ hivexsh_SOURCES = \ hivex.h \ byte_conversions.h -hivexsh_LDADD = libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE) +hivexsh_LDADD = libhivex.la $(LIBREADLINE) hivexsh_CFLAGS = \ -I$(top_srcdir)/gnulib/lib \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -- 1.6.5.2