Move ksquirrel-libs-png to kernel folder since it is shared by three different codecs (dicom, png, svg)

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/8/head
Michele Calgaro 1 year ago
parent 342c1d738b
commit 5b8d2d7359
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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
])

@ -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

@ -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\"

@ -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
AM_CXXFLAGS = -DCODEC_PNG

@ -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\"

Loading…
Cancel
Save