build: Integrate Gnulib non-recursively using fix-gnulib.

[liblbx.git] / src / Makefile.inc

diff --git a/src/Makefile.inc b/src/Makefile.inc
index a8772d183ffaf5777ff73593d1acbb3ef5fdc7be..02008660fca58fdf64869d1e028665fffdffe4a2 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -5,20 +5,23 @@
 # without any warranty.
 
 lbxdir = $(includedir)/lbx
-lbx_HEADERS = src/lbx.h src/image.h
+lbx_HEADERS = src/lbx.h src/image.h src/error.h
 
 noinst_HEADERS += src/misc.h src/tools.h src/pack.h
 
 lib_LTLIBRARIES  += liblbx.la
-liblbx_la_SOURCES = src/misc.c src/lbx.c src/fops.c src/image.c src/pack.c
+liblbx_la_SOURCES = src/lbx.c src/fops.c src/image.c src/pack.c src/error.c
+liblbx_la_LDFLAGS = -export-symbols-regex '^lbx_'
 
 bin_PROGRAMS    += lbxtool
 lbxtool_SOURCES  = src/lbxtool.c
-lbxtool_LDADD    = liblbx.la -lgnu
+lbxtool_LDADD    = liblbx.la libgnu.la
+$(lbxtool_OBJECTS): $(gnulib_headers)
 
 if BUILD_LBXIMG
 bin_PROGRAMS   += lbximg
 lbximg_SOURCES  = src/lbximg.c
-lbximg_LDADD    = liblbx.la $(LIBPNG_LIBS) -lgnu
+lbximg_LDADD    = liblbx.la libgnu.la $(LIBPNG_LIBS)
 lbximg_CFLAGS   = $(LIBPNG_CFLAGS)
+$(lbximg_OBJECTS): $(gnulib_headers)
 endif