From 875ac79d0ee16809252ad906dfb43171a1853834 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Wed, 6 Jul 2011 10:21:25 +0000 Subject: [PATCH] JPIP : fixed autotools to work with recent name changes --- applications/jpip/CHANGES | 3 +++ applications/jpip/mainpage.h | 4 ++-- .../opj_client/opj_dec_server/Makefile.am | 4 ++-- applications/jpip/tools/Makefile.am | 22 +++++++++---------- applications/jpip/tools/jpip_to_jp2.c | 4 ++-- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES index 479fdf2e..acf4d57f 100644 --- a/applications/jpip/CHANGES +++ b/applications/jpip/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPIP ! : changed + : added +July 6, 2011 +* [antonin] JPIP : fixed autotools to work with recent name changes + July 5, 2011 ! [kaori] changed parameter, file names, message names regarding JPT-stream to JPIP-stream, which handles also JPP-stream diff --git a/applications/jpip/mainpage.h b/applications/jpip/mainpage.h index 52edf42e..d7e127d2 100644 --- a/applications/jpip/mainpage.h +++ b/applications/jpip/mainpage.h @@ -39,8 +39,8 @@ * - opj_server.c JPIP server supporting HTTP connection and JPT-stream * - opj_dec_server.c Server to decode JPT-stream and communicate locally with JPIP client, which is coded in java * - addXMLinJP2.c To Embed metadata into JP2 file - * - jpt_to_jp2.c To Convert JPT-stream to JP2 - * - jpt_to_j2k.c To Convert JPT-stream to J2K + * - jpip_to_jp2.c To Convert JPT-stream to JP2 + * - jpip_to_j2k.c To Convert JPT-stream to J2K * - test_index.c To test index code format of a JP2 file * * \section license License diff --git a/applications/jpip/opj_client/opj_dec_server/Makefile.am b/applications/jpip/opj_client/opj_dec_server/Makefile.am index 368e4f97..4286a53d 100644 --- a/applications/jpip/opj_client/opj_dec_server/Makefile.am +++ b/applications/jpip/opj_client/opj_dec_server/Makefile.am @@ -19,8 +19,8 @@ imgsock_manager.c \ imgsock_manager.h \ jp2k_decoder.c \ jp2k_decoder.h \ -jptstream_manager.c \ -jptstream_manager.h \ +jpipstream_manager.c \ +jpipstream_manager.h \ opj_dec_server.c diff --git a/applications/jpip/tools/Makefile.am b/applications/jpip/tools/Makefile.am index dbcd82eb..f67ad0f1 100644 --- a/applications/jpip/tools/Makefile.am +++ b/applications/jpip/tools/Makefile.am @@ -2,27 +2,27 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = indexer -bin_PROGRAMS = jpt_to_jp2 jpt_to_j2k test_index addXMLinJP2 +bin_PROGRAMS = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2 -jpt_to_jp2_CPPFLAGS = \ +jpip_to_jp2_CPPFLAGS = \ -I. \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip/tools \ -I$(top_builddir)/applications/jpip/libopenjpip/tools -jpt_to_jp2_CFLAGS = -jpt_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la -jpt_to_jp2_SOURCES = jpt_to_jp2.c +jpip_to_jp2_CFLAGS = +jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la +jpip_to_jp2_SOURCES = jpip_to_jp2.c -jpt_to_j2k_CPPFLAGS = \ +jpip_to_j2k_CPPFLAGS = \ -I. \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip/tools \ -I$(top_builddir)/applications/jpip/libopenjpip/tools -jpt_to_j2k_CFLAGS = -jpt_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la -jpt_to_j2k_SOURCES = jpt_to_j2k.c +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. \ @@ -43,7 +43,7 @@ addXMLinJP2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_lo addXMLinJP2_SOURCES = addXMLinJP2.c install-data-hook: - @echo -e " (B)\t$(bindir)/jpt_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t$(bindir)/jpt_to_j2k$(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 @echo -e " (B)\t$(bindir)/addXMLinJP2$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/applications/jpip/tools/jpip_to_jp2.c b/applications/jpip/tools/jpip_to_jp2.c index 7be7ef91..979ddaf9 100644 --- a/applications/jpip/tools/jpip_to_jp2.c +++ b/applications/jpip/tools/jpip_to_jp2.c @@ -35,9 +35,9 @@ * This program takes two arguments. \n * -# Input JPT or JPP file * -# Output JP2 file\n - * % ./jpt_to_jp2 input.jpt output.jp2 + * % ./jpip_to_jp2 input.jpt output.jp2 * or - * % ./jpt_to_jp2 input.jpp output.jp2 + * % ./jpip_to_jp2 input.jpp output.jp2 */ #include