27 files changed, 9 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 6a698aa..c54d6e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -745,7 +745,6 @@ kernel/kls_dicom/ksquirrel-libs-dicom2png
 kernel/kls_svg/Makefile
 kernel/kls_svg/ksquirrel-libs-svg2png
 kernel/kls_wmf/Makefile
-kernel/kls_png/ksquirrel-libs-png/Makefile
 kernel/kls_png/Makefile
 kernel/kls_jpeg/Makefile
 kernel/kls_xwd/Makefile
@@ -788,6 +787,7 @@ kernel/kls_ljpeg/Makefile
 kernel/kls_eps/Makefile
 kernel/kls_psp/Makefile
 kernel/ksquirrel-libs/Makefile
+kernel/ksquirrel-libs-png/Makefile
 ksquirrellibs.pc
 ])
 
diff --git a/kernel/Makefile.am b/kernel/Makefile.am
index 7f29cf2..696470b 100644
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = ksquirrel-libs kls_avs kls_bmp kls_cut kls_dds kls_fli kls_hdr kls_ico kls_jbig kls_koala kls_lif kls_mdl kls_mtv kls_pcx kls_pix kls_pnm kls_psd kls_pxr kls_ras kls_rawrgb kls_sct kls_sgi kls_sun kls_tga kls_wal kls_wbmp kls_xbm kls_xcf kls_xcur kls_xpm kls_png kls_psp
+SUBDIRS = ksquirrel-libs ksquirrel-libs-png kls_avs kls_bmp kls_cut kls_dds kls_fli kls_hdr kls_ico kls_jbig kls_koala kls_lif kls_mdl kls_mtv kls_pcx kls_pix kls_pnm kls_psd kls_pxr kls_ras kls_rawrgb kls_sct kls_sgi kls_sun kls_tga kls_wal kls_wbmp kls_xbm kls_xcf kls_xcur kls_xpm kls_png kls_psp
 
 EXTRA_DIST = generate link include/*.h include/ksquirrel-libs/*.h xpm/*.xpm
 
diff --git a/kernel/kls_dicom/Makefile.am b/kernel/kls_dicom/Makefile.am
index 81d024c..28f6a8c 100644
--- a/kernel/kls_dicom/Makefile.am
+++ b/kernel/kls_dicom/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../include -I../kls_png
+INCLUDES = -I../include -I..
 
 bin_SCRIPTS = ksquirrel-libs-dicom2png
 
@@ -8,7 +8,7 @@ libkls_dicom_la_SOURCES = fmt_codec_png.cpp fmt_codec_png_defs.h
 
 libkls_dicom_la_LDFLAGS = ${SQ_RELEASE}
 
-libkls_dicom_la_LIBADD = ${SQ_LOCAL_RPATH} -L../kls_png/ksquirrel-libs-png -lksquirrel-libs-png
+libkls_dicom_la_LIBADD = ${SQ_LOCAL_RPATH} -L../ksquirrel-libs-png -lksquirrel-libs-png
 
 AM_CXXFLAGS = -DCODEC_DICOM -DDICOM=\"${bindir}/ksquirrel-libs-dicom2png\"
 
diff --git a/kernel/kls_png/Makefile.am b/kernel/kls_png/Makefile.am
index c66c0f2..82f8f09 100644
--- a/kernel/kls_png/Makefile.am
+++ b/kernel/kls_png/Makefile.am
@@ -1,6 +1,4 @@
-SUBDIRS = ksquirrel-libs-png
-
-INCLUDES = -I../include -Iksquirrel-libs-png
+INCLUDES = -I../include -I..
 
 pkglib_LTLIBRARIES = libkls_png.la
 
@@ -8,8 +6,8 @@ libkls_png_la_SOURCES = fmt_codec_png.cpp fmt_codec_png_defs.h
 
 libkls_png_la_LDFLAGS = ${SQ_RELEASE}
 
-libkls_png_la_LIBADD = ${SQ_LOCAL_RPATH} -Lksquirrel-libs-png -lksquirrel-libs-png
+libkls_png_la_LIBADD = ${SQ_LOCAL_RPATH} -L../ksquirrel-libs-png -lksquirrel-libs-png
 
 EXTRA_DIST = README
 
-AM_CXXFLAGS = -DCODEC_PNG
-\ No newline at end of file
+AM_CXXFLAGS = -DCODEC_PNG
diff --git a/kernel/kls_svg/Makefile.am b/kernel/kls_svg/Makefile.am
index 9e2474c..0623b49 100644
--- a/kernel/kls_svg/Makefile.am
+++ b/kernel/kls_svg/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../include -I../kls_png
+INCLUDES = -I../include -I..
 
 bin_SCRIPTS = ksquirrel-libs-svg2png
 
@@ -8,7 +8,7 @@ libkls_svg_la_SOURCES = fmt_codec_png.cpp fmt_codec_png_defs.h
 
 libkls_svg_la_LDFLAGS = ${SQ_RELEASE}
 
-libkls_svg_la_LIBADD = ${SQ_LOCAL_RPATH} -L../kls_png/ksquirrel-libs-png -lksquirrel-libs-png
+libkls_svg_la_LIBADD = ${SQ_LOCAL_RPATH} -L../ksquirrel-libs-png -lksquirrel-libs-png
 
 AM_CXXFLAGS = -DCODEC_SVG -DCODEC_ANOTHER -DSVG_UI=\"${pkgdatadir}/libkls_svg.so.ui\" -DRSVG=\"${RSVG}\" -DSVG2PNG=\"${bindir}/ksquirrel-libs-svg2png\"
 
diff --git a/kernel/kls_png/ksquirrel-libs-png/Makefile.am b/kernel/ksquirrel-libs-png/Makefile.am
index 084a02e..084a02e 100644
--- a/kernel/kls_png/ksquirrel-libs-png/Makefile.am
+++ b/kernel/ksquirrel-libs-png/Makefile.am
diff --git a/kernel/kls_png/ksquirrel-libs-png/png.cpp b/kernel/ksquirrel-libs-png/png.cpp
index 3e507c6..3e507c6 100644
--- a/kernel/kls_png/ksquirrel-libs-png/png.cpp
+++ b/kernel/ksquirrel-libs-png/png.cpp
diff --git a/kernel/kls_png/ksquirrel-libs-png/png.h b/kernel/ksquirrel-libs-png/png.h
index 0b4873c..0b4873c 100644
--- a/kernel/kls_png/ksquirrel-libs-png/png.h
+++ b/kernel/ksquirrel-libs-png/png.h
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngconf.h b/kernel/ksquirrel-libs-png/pngconf.h
index cfd61bf..cfd61bf 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngconf.h
+++ b/kernel/ksquirrel-libs-png/pngconf.h
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngerror.c b/kernel/ksquirrel-libs-png/pngerror.c
index 159c5d4..159c5d4 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngerror.c
+++ b/kernel/ksquirrel-libs-png/pngerror.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pnggccrd.c b/kernel/ksquirrel-libs-png/pnggccrd.c
index a7248d6..a7248d6 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pnggccrd.c
+++ b/kernel/ksquirrel-libs-png/pnggccrd.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngget.c b/kernel/ksquirrel-libs-png/pngget.c
index d700f30..d700f30 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngget.c
+++ b/kernel/ksquirrel-libs-png/pngget.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pnghack.h b/kernel/ksquirrel-libs-png/pnghack.h
index cba90da..cba90da 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pnghack.h
+++ b/kernel/ksquirrel-libs-png/pnghack.h
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngmem.c b/kernel/ksquirrel-libs-png/pngmem.c
index 248060f..248060f 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngmem.c
+++ b/kernel/ksquirrel-libs-png/pngmem.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngpread.c b/kernel/ksquirrel-libs-png/pngpread.c
index f34553b..f34553b 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngpread.c
+++ b/kernel/ksquirrel-libs-png/pngpread.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngread.c b/kernel/ksquirrel-libs-png/pngread.c
index 285c18d..285c18d 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngread.c
+++ b/kernel/ksquirrel-libs-png/pngread.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngrio.c b/kernel/ksquirrel-libs-png/pngrio.c
index 7d2522f..7d2522f 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngrio.c
+++ b/kernel/ksquirrel-libs-png/pngrio.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngrtran.c b/kernel/ksquirrel-libs-png/pngrtran.c
index 97f12e6..97f12e6 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngrtran.c
+++ b/kernel/ksquirrel-libs-png/pngrtran.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngrutil.c b/kernel/ksquirrel-libs-png/pngrutil.c
index 6552af3..6552af3 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngrutil.c
+++ b/kernel/ksquirrel-libs-png/pngrutil.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngset.c b/kernel/ksquirrel-libs-png/pngset.c
index b16af79..b16af79 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngset.c
+++ b/kernel/ksquirrel-libs-png/pngset.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngtest.c b/kernel/ksquirrel-libs-png/pngtest.c
index 3981a49..3981a49 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngtest.c
+++ b/kernel/ksquirrel-libs-png/pngtest.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngtrans.c b/kernel/ksquirrel-libs-png/pngtrans.c
index 1640095..1640095 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngtrans.c
+++ b/kernel/ksquirrel-libs-png/pngtrans.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngvcrd.c b/kernel/ksquirrel-libs-png/pngvcrd.c
index ce4233e..ce4233e 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngvcrd.c
+++ b/kernel/ksquirrel-libs-png/pngvcrd.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngwio.c b/kernel/ksquirrel-libs-png/pngwio.c
index 371a4fa..371a4fa 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngwio.c
+++ b/kernel/ksquirrel-libs-png/pngwio.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngwrite.c b/kernel/ksquirrel-libs-png/pngwrite.c
index 61ecb25..61ecb25 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngwrite.c
+++ b/kernel/ksquirrel-libs-png/pngwrite.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngwtran.c b/kernel/ksquirrel-libs-png/pngwtran.c
index 0372fe6..0372fe6 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngwtran.c
+++ b/kernel/ksquirrel-libs-png/pngwtran.c
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngwutil.c b/kernel/ksquirrel-libs-png/pngwutil.c
index a526c66..a526c66 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngwutil.c
+++ b/kernel/ksquirrel-libs-png/pngwutil.c