fixed autotools (broken since the new directory structure) and added autotools as a build method for jpip (credit to Vincent Torri)

2 files changed, 32 insertions, 73 deletions

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 458f957a..c0dd1639 100644
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -1,5 +1,11 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+SUBDIRS = .
+
+if WANT_JPWL
+SUBDIRS += jpwl
+endif
+
 includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
 includes_HEADERS = openjpeg.h
 
@@ -31,6 +37,7 @@ openjpeg.c \
 pi.c \
 raw.c \
 t1.c \
+t1_generate_luts.c \
 t2.c \
 tcd.c \
 tgt.c \
@@ -47,15 +54,15 @@ 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 \
-opj_malloc.h \
-opj_includes.h
+tgt.h
 
 EXTRA_DIST = \
 CMakeLists.txt
diff --git a/libopenjpeg/jpwl/Makefile.am b/libopenjpeg/jpwl/Makefile.am
index 3bbce011..c6b6a7aa 100644
--- a/libopenjpeg/jpwl/Makefile.am
+++ b/libopenjpeg/jpwl/Makefile.am
@@ -3,31 +3,32 @@ MAINTAINERCLEANFILES = Makefile.in
 lib_LTLIBRARIES = libopenjpeg_JPWL.la
 
 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
+../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
 
 libopenjpeg_JPWL_la_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/libopenjpeg \
 -I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/jpwl \
--I$(top_builddir)/jpwl \
+-I$(top_srcdir)/libopenjpeg/jpwl \
+-I$(top_builddir)/libopenjpeg/jpwl \
 -DUSE_JPWL
 libopenjpeg_JPWL_la_CFLAGS =
 libopenjpeg_JPWL_la_LIBADD = -lm
@@ -38,60 +39,11 @@ crc.c \
 jpwl.c \
 jpwl_lib.c \
 rs.c \
-jpwl.h \
 crc.h \
+jpwl.h \
 rs.h
 
-bin_PROGRAMS = JPWL_j2k_to_image JPWL_image_to_j2k
-
-JPWL_j2k_to_image_CPPFLAGS = \
--I. \
--I$(top_srcdir)/common \
--I$(top_builddir)/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/jpwl \
--I$(top_builddir)/jpwl \
--DUSE_JPWL \
-@TIFF_CFLAGS@ \
-@PNG_CFLAGS@ \
-@LCMS1_CFLAGS@ \
-@LCMS2_CFLAGS@
-JPWL_j2k_to_image_CFLAGS =
-JPWL_j2k_to_image_LDADD = $(top_builddir)/jpwl/libopenjpeg_JPWL.la  @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@
-JPWL_j2k_to_image_SOURCES = \
-$(top_builddir)/common/color.c \
-$(top_builddir)/common/getopt.c \
-$(top_builddir)/codec/index.c \
-$(top_builddir)/codec/convert.c \
-$(top_builddir)/codec/j2k_to_image.c
-
-JPWL_image_to_j2k_CPPFLAGS = \
--I. \
--I$(top_srcdir)/common \
--I$(top_builddir)/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/jpwl \
--I$(top_builddir)/jpwl \
--DUSE_JPWL \
-@TIFF_CFLAGS@ \
-@PNG_CFLAGS@
-JPWL_image_to_j2k_CFLAGS =
-JPWL_image_to_j2k_LDADD = $(top_builddir)/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@
-
-JPWL_image_to_j2k_SOURCES = \
-$(top_builddir)/common/getopt.c \
-$(top_builddir)/codec/index.c \
-$(top_builddir)/codec/convert.c \
-$(top_builddir)/codec/image_to_j2k.c
-
-EXTRA_DIST = \
-CMakeLists.txt
-
 install-data-hook:
-	@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
 	@echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt
 	@( $(call solist) ) >> $(top_builddir)/report.txt
 	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt