lbximg: Make libpng a soft dependency.

[liblbx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9c16381a1984877917ca805205cbbbeefab90c34..966ad2ea7d587517c209867b2b54c078bb8e4c23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,22 +25,23 @@ lib_LTLIBRARIES = liblbx.la
 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
-if BUILD_LBXIMG
-bin_PROGRAMS += lbximg
-endif
+bin_PROGRAMS = lbxtool lbximg
 if BUILD_LBXGUI
 bin_PROGRAMS += lbxgui
 endif
 
-lbxtool_SOURCES = src/lbxtool.c
+lbxtool_SOURCES = src/lbxtool.c src/tools.c
 lbxtool_LDADD = liblbx.la libgnu.la
 $(lbxtool_OBJECTS): $(gnulib_headers)
 
-lbximg_SOURCES = src/lbximg.c
+lbximg_SOURCES = src/lbximg.c src/tools.c src/pnm.c
 lbximg_LDADD = liblbx.la libgnu.la $(LIBPNG_LIBS)
 $(lbximg_OBJECTS): $(gnulib_headers)
 
+if HAVE_LIBPNG
+lbximg_SOURCES += src/png.c
+endif
+
 nodist_lbxgui_SOURCES = src/gui/lbxgui.glade.c
 lbxgui_SOURCES = src/gui/lbxgui.c src/gui/render.c src/gui/render.h \
        src/gui/bg.xbm