lib_LTLIBRARIES = liblbx.la
-bin_PROGRAMS = lbxtool lbximg
-include_HEADERS = lbx.h
+
+lbxdir = $(includedir)/lbx
+lbx_HEADERS = lbx.h image.h
liblbx_la_SOURCES = byteorder.h misc.h misc.c lbx.c image.c
-lbxtool_SOURCES = lbxtool.c
+bin_PROGRAMS = lbxtool
+lbxtool_SOURCES = tools.h lbxtool.c
lbxtool_LDADD = liblbx.la
if BUILD_LBXIMG
-lbximg_SOURCES = lbximg.c
-lbximg_LDADD = liblbx.la
-lbximg_CFLAGS = $(PNG_CFLAGS)
-lbximg_LDFLAGS = $(PNG_LIBS)
+bin_PROGRAMS += lbximg
+lbximg_SOURCES = tools.h lbximg.c
+lbximg_LDADD = liblbx.la $(LIBPNG_LIBS)
+lbximg_CFLAGS = $(LIBPNG_CFLAGS)
endif