[trunk] FolderReorgProposal task: only keep a single build system

8 files changed, 0 insertions, 765 deletions

diff --git a/src/bin/jp2/Makefile.am b/src/bin/jp2/Makefile.am
deleted file mode 100644
index 17be3b88..00000000
--- a/src/bin/jp2/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-bin_PROGRAMS = j2k_to_image image_to_j2k j2k_dump
-
-if WANT_JPWL
-bin_PROGRAMS += JPWL_j2k_to_image JPWL_image_to_j2k
-endif
-
-j2k_to_image_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/codec \
--I$(top_builddir)/applications/codec \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@PNG_CFLAGS@ \
-@TIFF_CFLAGS@ \
-@LCMS1_CFLAGS@ \
-@LCMS2_CFLAGS@
-j2k_to_image_CFLAGS = 
-j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ -lm
-j2k_to_image_SOURCES = \
-../common/color.c \
-../common/opj_getopt.c \
-convert.c \
-index.c \
-j2k_to_image.c \
-../common/color.h
-
-image_to_j2k_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/codec \
--I$(top_builddir)/applications/codec \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@PNG_CFLAGS@ \
-@TIFF_CFLAGS@
-image_to_j2k_CFLAGS = 
-image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @TIFF_LIBS@ @PNG_LIBS@ -lm
-image_to_j2k_SOURCES = \
-../common/opj_getopt.c \
-convert.c \
-index.c \
-image_to_j2k.c \
-convert.h \
-../common/format_defs.h \
-index.h
-
-j2k_dump_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/codec \
--I$(top_builddir)/applications/codec \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg
-j2k_dump_CFLAGS = 
-j2k_dump_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
-j2k_dump_SOURCES = \
-../common/opj_getopt.c \
-index.c \
-j2k_dump.c \
-../common/opj_getopt.h \
-index.h
-
-JPWL_j2k_to_image_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DUSE_JPWL \
-@TIFF_CFLAGS@ \
-@PNG_CFLAGS@ \
-@LCMS1_CFLAGS@ \
-@LCMS2_CFLAGS@
-JPWL_j2k_to_image_CFLAGS =
-JPWL_j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la  @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@
-JPWL_j2k_to_image_SOURCES = \
-../common/color.c \
-../common/opj_getopt.c \
-index.c \
-convert.c \
-j2k_to_image.c
-
-JPWL_image_to_j2k_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DUSE_JPWL \
-@TIFF_CFLAGS@ \
-@PNG_CFLAGS@
-JPWL_image_to_j2k_CFLAGS =
-JPWL_image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@
-
-JPWL_image_to_j2k_SOURCES = \
-../common/opj_getopt.c \
-index.c \
-convert.c \
-image_to_j2k.c
-
-EXTRA_DIST = \
-CMakeLists.txt \
-windirent.h
-
-install-data-hook:
-	@echo -e " (B)\t$(bindir)/j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/j2k_dump$(EXEEXT)" >> $(top_builddir)/report.txt
-if WANT_JPWL
-	@echo -e " (B)\t$(bindir)/JPWL_j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/JPWL_image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
-endif
diff --git a/src/bin/jp3d/Makefile.am b/src/bin/jp3d/Makefile.am
deleted file mode 100644
index bf6ff1e5..00000000
--- a/src/bin/jp3d/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-bin_PROGRAMS = jp3d_to_volume volume_to_jp3d
-LDADD = $(USERLIBS) ../libjp3dvm/libopenjp3dvm.la
-
-jp3d_to_volume_CPPFLAGS =
-jp3d_to_volume_CFLAGS =
-jp3d_to_volume_LDADD = $(top_builddir)/jp3d/libjp3dvm/libopenjp3dvm.la -lm
-jp3d_to_volume_SOURCES = getopt.c convert.c jp3d_to_volume.c convert.h
-
-volume_to_jp3d_CPPFLAGS =
-volume_to_jp3d_CFLAGS =
-volume_to_jp3d_LDADD = $(top_builddir)/jp3d/libjp3dvm/libopenjp3dvm.la
-volume_to_jp3d_SOURCES = getopt.c convert.c volume_to_jp3d.c convert.h
-
-EXTRA_DIST = \
-CMakeLists.txt \
-windirent.h
-
-install-data-hook:
-	@echo -e " (B)\t$(bindir)/jp3d_to_volume$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/volume_to_jp3d$(EXEEXT)" >> $(top_builddir)/report.txt
diff --git a/src/bin/jpip/Makefile.am b/src/bin/jpip/Makefile.am
deleted file mode 100644
index 0e98b71e..00000000
--- a/src/bin/jpip/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-bin_PROGRAMS =
-
-if WANT_JPIP
-bin_PROGRAMS += opj_dec_server test_index jpip_to_j2k jpip_to_jp2
-endif
-
-if WANT_JPIP_SERVER
-bin_PROGRAMS += opj_server
-endif
-
-opj_server_CPPFLAGS = \
-@FCGI_CFLAGS@ \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip \
--DSERVER \
--DQUIT_SIGNAL=\"quitJPIP\"
-#
-opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm
-#
-opj_server_SOURCES = opj_server.c
-
-#-------------
-opj_dec_server_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-opj_dec_server_CFLAGS =
-opj_dec_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-opj_dec_server_SOURCES = opj_dec_server.c
-
-#-------------
-jpip_to_jp2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-jpip_to_jp2_CFLAGS =
-jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-jpip_to_jp2_SOURCES = jpip_to_jp2.c
-
-#-------------
-jpip_to_j2k_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-jpip_to_j2k_CFLAGS =
-jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-jpip_to_j2k_SOURCES = jpip_to_j2k.c
-
-#-------------
-test_index_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-test_index_CFLAGS =
-test_index_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-test_index_SOURCES = test_index.c
-
-#-------------
-install-data-hook:
-if WANT_JPIP_SERVER
-	@echo -e " (B)\t$(bindir)/opj_server$(EXEEXT)" >> $(top_builddir)/report.txt
-endif
-if WANT_JPIP
-	@echo -e " (B)\t$(bindir)/opj_dec_server$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/jpip_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/jpip_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/test_index$(EXEEXT)" >> $(top_builddir)/report.txt
-endif
diff --git a/src/bin/mj2/Makefile.am b/src/bin/mj2/Makefile.am
deleted file mode 100644
index cff65660..00000000
--- a/src/bin/mj2/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-OPJ_SRC = \
-../../libopenjpeg/bio.c \
-../../libopenjpeg/cio.c \
-../../libopenjpeg/dwt.c \
-../../libopenjpeg/event.c \
-../../libopenjpeg/image.c \
-../../libopenjpeg/j2k.c \
-../../libopenjpeg/j2k_lib.c \
-../../libopenjpeg/jp2.c \
-../../libopenjpeg/jpt.c \
-../../libopenjpeg/mct.c \
-../../libopenjpeg/mqc.c \
-../../libopenjpeg/openjpeg.c \
-../../libopenjpeg/pi.c \
-../../libopenjpeg/raw.c \
-../../libopenjpeg/t1.c \
-../../libopenjpeg/t2.c \
-../../libopenjpeg/tcd.c \
-../../libopenjpeg/tgt.c \
-../../libopenjpeg/cidx_manager.c \
-../../libopenjpeg/phix_manager.c \
-../../libopenjpeg/ppix_manager.c \
-../../libopenjpeg/thix_manager.c \
-../../libopenjpeg/tpix_manager.c \
-../../libopenjpeg/function_list.c
-
-bin_PROGRAMS = \
-frames_to_mj2 \
-mj2_to_frames \
-extract_j2k_from_mj2 \
-wrap_j2k_in_mj2
-
-frames_to_mj2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DOPJ_STATIC
-frames_to_mj2_CFLAGS = 
-frames_to_mj2_LDADD = -lm
-frames_to_mj2_SOURCES = \
-$(OPJ_SRC) \
-../common/opj_getopt.c \
-mj2_convert.c \
-mj2.c \
-frames_to_mj2.c \
-mj2.h \
-mj2_convert.h
-
-mj2_to_frames_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@LCMS2_CFLAGS@ \
-@LCMS1_CFLAGS@ \
--DOPJ_STATIC
-mj2_to_frames_CFLAGS = 
-mj2_to_frames_LDADD = @LCMS2_LIBS@ @LCMS1_LIBS@ -lm
-mj2_to_frames_SOURCES = \
-$(OPJ_SRC) \
-../common/color.c \
-../common/opj_getopt.c \
-mj2_convert.c \
-mj2.c \
-mj2_to_frames.c \
-mj2.h \
-mj2_convert.h
-
-extract_j2k_from_mj2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DOPJ_STATIC
-extract_j2k_from_mj2_CFLAGS = 
-extract_j2k_from_mj2_LDADD = -lm
-extract_j2k_from_mj2_SOURCES = \
-$(OPJ_SRC) \
-mj2.c \
-extract_j2k_from_mj2.c \
-mj2.h
-
-wrap_j2k_in_mj2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DOPJ_STATIC
-wrap_j2k_in_mj2_CFLAGS = 
-wrap_j2k_in_mj2_LDADD = -lm
-wrap_j2k_in_mj2_SOURCES = \
-$(OPJ_SRC) \
-mj2.c \
-wrap_j2k_in_mj2.c \
-mj2.h
-
-EXTRA_DIST = \
-CMakeLists.txt
-
-install-data-hook:
-	@echo -e " (B)\t$(bindir)/frames_to_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/mj2_to_frames$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/extract_j2k_from_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/wrap_j2k_in_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
diff --git a/src/lib/openjp2/Makefile.am b/src/lib/openjp2/Makefile.am
deleted file mode 100644
index 2fb79f9f..00000000
--- a/src/lib/openjp2/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = .
-
-if WANT_JPWL
-SUBDIRS += jpwl
-endif
-
-includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
-includes_HEADERS = openjpeg.h opj_stdint.h $(top_builddir)/opj_config.h
-
-lib_LTLIBRARIES = libopenjpeg.la
-
-libopenjpeg_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg
-libopenjpeg_la_CFLAGS =
-libopenjpeg_la_LIBADD = -lm
-libopenjpeg_la_LDFLAGS = -no-undefined -version-info @lt_version@
-
-libopenjpeg_la_SOURCES = \
-bio.c \
-cio.c \
-dwt.c \
-event.c \
-image.c \
-j2k.c \
-j2k_lib.c \
-jp2.c \
-jpt.c \
-mct.c \
-mqc.c \
-openjpeg.c \
-pi.c \
-raw.c \
-t1.c \
-t1_generate_luts.c \
-t2.c \
-tcd.c \
-tgt.c \
-cidx_manager.c \
-phix_manager.c \
-ppix_manager.c \
-thix_manager.c \
-tpix_manager.c \
-function_list.c \
-bio.h \
-cio.h \
-dwt.h \
-event.h \
-fix.h \
-image.h \
-indexbox_manager.h \
-int.h \
-j2k.h \
-j2k_lib.h \
-jp2.h \
-jpt.h \
-mct.h \
-mqc.h \
-opj_includes.h \
-opj_malloc.h \
-pi.h \
-raw.h \
-t1.h \
-t1_luts.h \
-t2.h \
-tcd.h \
-tgt.h \
-cidx_manager.h \
-function_list.h
-
-EXTRA_DIST = \
-CMakeLists.txt
-
-install-data-hook:
-	cd $(DESTDIR)$(includedir) && rm -f openjpeg.h
-	@rm -rf $(top_builddir)/report.txt
-	@echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
-endif
-	@echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(includedir)/openjpeg.h
-
-solist    = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
-get_tok   = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)
-base      = $(call get_tok,libdir)
-so        = $(call get_tok,library_names)
-a         = $(call get_tok,old_library)
-
-if HAVE_WIN32
-SO_PREFIX = (DLL)
-dll       = $(call get_tok,dlname)
-else
-if HAVE_DARWIN
-SO_PREFIX = (DY)
-dll       =
-else
-SO_PREFIX = (SO)
-dll       =
-endif
-endif
diff --git a/src/lib/openjp3d/Makefile.am b/src/lib/openjp3d/Makefile.am
deleted file mode 100644
index 578bcac2..00000000
--- a/src/lib/openjp3d/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-lib_LTLIBRARIES = libopenjp3dvm.la
-
-includesdir = ${includedir}/openjp3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@
-includes_HEADERS = openjp3d.h
-
-libopenjp3dvm_la_LDFLAGS = -no-undefined -version-info @lt_version_jp3d@
-
-libopenjp3dvm_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/jp3d/libjp3dvm \
--I$(top_builddir)/jp3d/libjp3dvm
-libopenjp3dvm_la_CFLAGS =
-libopenjp3dvm_la_LIBADD = -lm
-libopenjp3dvm_la_SOURCES = \
-bio.c \
-cio.c \
-dwt.c \
-event.c \
-jp3d.c \
-jp3d_lib.c \
-volume.c \
-mct.c \
-mqc.c \
-openjp3d.c \
-pi.c \
-raw.c \
-t1.c \
-t1_3d.c \
-t2.c \
-tcd.c \
-tgt.c \
-bio.h \
-cio.h \
-dwt.h \
-event.h \
-fix.h \
-int.h \
-jp3d.h \
-jp3d_lib.h \
-mct.h \
-mqc.h \
-opj_includes.h \
-pi.h \
-raw.h \
-t1.h \
-t1_3d.h \
-t2.h \
-tcd.h \
-tgt.h \
-volume.h
-
-EXTRA_DIST = \
-CMakeLists.txt
-
-install-data-hook:
-	cd $(DESTDIR)$(includedir) && \
-	  rm -f openjp3d.h && \
-	  $(LN_S) openjp3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@/openjp3d.h \
-	          openjp3d.h
-	@echo -e " (LA)\t$(libdir)/libopenjp3dvm.la" >> $(top_builddir)/report.txt
-	@( $(call solist) ) >> $(top_builddir)/report.txt
-	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
-	@echo -e " (H)\t$(includedir)/openjp3d-$(MAJOR_NR).$(MINOR_NR)/openjp3d.h" >> $(top_builddir)/report.txt
-	@echo -e " (LN)\t$(includedir)/openjp3d.h" >> $(top_builddir)/report.txt
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(includedir)/openjp3d.h
-
-solist    = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
-get_tok   = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)
-base      = $(call get_tok,libdir)
-so        = $(call get_tok,library_names)
-a         = $(call get_tok,old_library)
-
-if HAVE_WIN32
-SO_PREFIX = (DLL)
-dll       = $(call get_tok,dlname)
-else
-if HAVE_DARWIN
-SO_PREFIX = (DY)
-dll       =
-else
-SO_PREFIX = (SO)
-dll       =
-endif
-endif
diff --git a/src/lib/openjpip/Makefile.am b/src/lib/openjpip/Makefile.am
deleted file mode 100644
index 6def5d6f..00000000
--- a/src/lib/openjpip/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
-includes_HEADERS = 
-
-lib_LTLIBRARIES =
-
-if WANT_JPIP
-lib_LTLIBRARIES += libopenjpip_local.la
-endif
-
-if WANT_JPIP_SERVER
-lib_LTLIBRARIES += libopenjpip_server.la
-endif
-
-JPIP_SRC = \
-openjpip.c \
-query_parser.c \
-channel_manager.c \
-session_manager.c \
-jpip_parser.c \
-boxheader_manager.c \
-codestream_manager.c \
-imgreg_manager.c \
-marker_manager.c \
-msgqueue_manager.c \
-box_manager.c \
-faixbox_manager.c \
-index_manager.c \
-metadata_manager.c \
-placeholder_manager.c \
-byte_manager.c \
-ihdrbox_manager.c \
-manfbox_manager.c \
-mhixbox_manager.c \
-target_manager.c \
-cachemodel_manager.c \
-j2kheader_manager.c \
-jp2k_encoder.c \
-sock_manager.c \
-openjpip.h \
-bool.h \
-boxheader_manager.h \
-box_manager.h \
-byte_manager.h \
-codestream_manager.h \
-faixbox_manager.h \
-ihdrbox_manager.h \
-imgreg_manager.h \
-index_manager.h \
-manfbox_manager.h \
-marker_manager.h \
-metadata_manager.h \
-mhixbox_manager.h \
-msgqueue_manager.h \
-placeholder_manager.h \
-target_manager.h \
-cachemodel_manager.h \
-j2kheader_manager.h \
-jp2k_encoder.h \
-query_parser.h \
-channel_manager.h \
-session_manager.h \
-jpip_parser.h \
-jp2k_decoder.h \
-sock_manager.h 
-
-SERVER_SRC = auxtrans_manager.c \
-auxtrans_manager.h
-
-LOCAL_SRC = jp2k_decoder.c \
-imgsock_manager.c \
-jpipstream_manager.c \
-cache_manager.c \
-dec_clientmsg_handler.c \
-imgsock_manager.h \
-jpipstream_manager.h \
-cache_manager.h \
-dec_clientmsg_handler.h
-
-libopenjpip_server_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip \
-@FCGI_CFLAGS@ \
-@LIBCURL_CFLAGS@ \
--DSERVER
-libopenjpip_server_la_CFLAGS = @THREAD_CFLAGS@
-libopenjpip_server_la_LIBADD = @FCGI_LIBS@ @LIBCURL_LIBS@ @THREAD_LIBS@ -lm
-libopenjpip_server_la_LDFLAGS = -no-undefined -version-info @lt_version@
-libopenjpip_server_la_SOURCES = $(JPIP_SRC) $(SERVER_SRC)
-
-libopenjpip_local_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip \
-@LIBCURL_CFLAGS@
-libopenjpip_local_la_CFLAGS = 
-libopenjpip_local_la_LIBADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
-libopenjpip_local_la_LDFLAGS = -no-undefined -version-info @lt_version@
-libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC)
-
-install-data-hook:
-if WANT_JPIP_SERVER
-	@echo -e " (LA)\t$(libdir)/libopenjpip_server.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist_s) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base_s)/$(a_s)" >> $(top_builddir)/report.txt
-endif
-endif
-if WANT_JPIP
-	@echo -e " (LA)\t$(libdir)/libopenjpip_local.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist_c) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base_c)/$(a_c)" >> $(top_builddir)/report.txt
-endif
-endif
-
-solist_s    = $(foreach f, $(dll_s) $(so_s), echo -e ' $(SO_PREFIX)\t$(base_s)/$(f)' ;)
-get_tok_s   = $(shell grep -E "^$(1)=" libopenjpip_server.la | cut -d "'" -f 2)
-base_s      = $(call get_tok_s,libdir)
-so_s        = $(call get_tok_s,library_names)
-a_s         = $(call get_tok_s,old_library)
-
-solist_c    = $(foreach f, $(dll_c) $(so_c), echo -e ' $(SO_PREFIX)\t$(base_c)/$(f)' ;)
-get_tok_c   = $(shell grep -E "^$(1)=" libopenjpip_local.la | cut -d "'" -f 2)
-base_c      = $(call get_tok_c,libdir)
-so_c        = $(call get_tok_c,library_names)
-a_c         = $(call get_tok_c,old_library)
-
-if HAVE_WIN32
-SO_PREFIX = (DLL)
-dll_s     = $(call get_tok_s,dlname)
-dll_c     = $(call get_tok_c,dlname)
-else
-if HAVE_DARWIN
-SO_PREFIX = (DY)
-dll_s     =
-dll_c     =
-else
-SO_PREFIX = (SO)
-dll_s     =
-dll_c     =
-endif
-endif
diff --git a/src/lib/openjpwl/Makefile.am b/src/lib/openjpwl/Makefile.am
deleted file mode 100644
index 26ab4eba..00000000
--- a/src/lib/openjpwl/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-lib_LTLIBRARIES = libopenjpeg_JPWL.la
-
-OPJ_SRC = \
-../bio.c \
-../cio.c \
-../dwt.c \
-../event.c \
-../image.c \
-../j2k.c \
-../j2k_lib.c \
-../jp2.c \
-../jpt.c \
-../mct.c \
-../mqc.c \
-../openjpeg.c \
-../pi.c \
-../raw.c \
-../t1.c \
-../t1_generate_luts.c \
-../t2.c \
-../tcd.c \
-../tgt.c \
-../cidx_manager.c \
-../phix_manager.c \
-../ppix_manager.c \
-../thix_manager.c \
-../tpix_manager.c \
-../function_list.c
-
-libopenjpeg_JPWL_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/libopenjpeg/jpwl \
--I$(top_builddir)/libopenjpeg/jpwl \
--DUSE_JPWL
-libopenjpeg_JPWL_la_CFLAGS =
-libopenjpeg_JPWL_la_LIBADD = -lm
-libopenjpeg_JPWL_la_LDFLAGS = -no-undefined -version-info @lt_version@
-libopenjpeg_JPWL_la_SOURCES = \
-$(OPJ_SRC) \
-crc.c \
-jpwl.c \
-jpwl_lib.c \
-rs.c \
-crc.h \
-jpwl.h \
-rs.h
-
-install-data-hook:
-	@echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
-endif
-
-solist    = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
-get_tok   = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)
-base      = $(call get_tok,libdir)
-so        = $(call get_tok,library_names)
-a         = $(call get_tok,old_library)
-
-if HAVE_WIN32
-SO_PREFIX = (DLL)
-dll       = $(call get_tok,dlname)
-else
-if HAVE_DARWIN
-SO_PREFIX = (DY)
-dll       =
-else
-SO_PREFIX = (SO)
-dll       =
-endif
-endif