diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-05-23 20:30:20 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-05-23 20:30:20 +0000 |
| commit | 586581685c4b48a50e9cc3faa44ee58d0099af52 (patch) | |
| tree | f85163af26db1bf735ce03560265d079286be5a2 /applications/codec | |
| parent | 88f43b15fab0c75c10635c9e3d6381e5d716b8e9 (diff) | |
fixed autotools (broken since the new directory structure) and added autotools as a build method for jpip (credit to Vincent Torri)
Diffstat (limited to 'applications/codec')
| -rw-r--r-- | applications/codec/Makefile.am | 70 |
1 files changed, 58 insertions, 12 deletions
diff --git a/applications/codec/Makefile.am b/applications/codec/Makefile.am index 14e5160d..528c8640 100644 --- a/applications/codec/Makefile.am +++ b/applications/codec/Makefile.am @@ -2,12 +2,16 @@ 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)/codec \ --I$(top_builddir)/codec \ --I$(top_srcdir)/common \ --I$(top_builddir)/common \ +-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@ \ @@ -26,10 +30,10 @@ j2k_to_image.c \ image_to_j2k_CPPFLAGS = \ -I. \ --I$(top_srcdir)/codec \ --I$(top_builddir)/codec \ --I$(top_srcdir)/common \ --I$(top_builddir)/common \ +-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@ \ @@ -47,10 +51,10 @@ index.h j2k_dump_CPPFLAGS = \ -I. \ --I$(top_srcdir)/codec \ --I$(top_builddir)/codec \ --I$(top_srcdir)/common \ --I$(top_builddir)/common \ +-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 = @@ -62,6 +66,44 @@ j2k_dump.c \ ../common/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/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/getopt.c \ +index.c \ +convert.c \ +image_to_j2k.c + EXTRA_DIST = \ CMakeLists.txt \ windirent.h @@ -70,3 +112,7 @@ 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 |