JPIP : fixed autotools to work with recent name changes

diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 479fdf2e8412cd36bcc2fe47fb8864fbf5f4ad7a..acf4d57fa7583dfdedc2f7bd319bc681b5edfca2 100644 (file)
--- 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 52edf42e12abc616dbe15bc639bc36b3d8c2486c..d7e127d2dd0f09393a908960b8112f6ce6b10d70 100644 (file)
--- 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 368e4f9782852e3a8d93f1832b8b77a755eb65f5..4286a53deeeb815eb00228bcb6e32d2ff3904ddb 100644 (file)
--- 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 dbcd82ebcee24965d2228a7ac1ef286620796b47..f67ad0f12c8d87f74f4fdd216ebaba5047936cd1 100644 (file)
--- a/applications/jpip/tools/Makefile.am
+++ b/applications/jpip/tools/Makefile.am
@@ -2,27 +2,27 @@ MAINTAINERCLEANFILES = Makefile.in
 \r
 SUBDIRS = indexer\r
 \r
-bin_PROGRAMS = jpt_to_jp2 jpt_to_j2k test_index addXMLinJP2\r
+bin_PROGRAMS = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2\r
 \r
-jpt_to_jp2_CPPFLAGS = \\r
+jpip_to_jp2_CPPFLAGS = \\r
 -I. \\r
 -I$(top_srcdir)/applications/jpip/libopenjpip \\r
 -I$(top_builddir)/applications/jpip/libopenjpip \\r
 -I$(top_srcdir)/applications/jpip/libopenjpip/tools \\r
 -I$(top_builddir)/applications/jpip/libopenjpip/tools\r
-jpt_to_jp2_CFLAGS = \r
-jpt_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la\r
-jpt_to_jp2_SOURCES = jpt_to_jp2.c\r
+jpip_to_jp2_CFLAGS = \r
+jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la\r
+jpip_to_jp2_SOURCES = jpip_to_jp2.c\r
 \r
-jpt_to_j2k_CPPFLAGS = \\r
+jpip_to_j2k_CPPFLAGS = \\r
 -I. \\r
 -I$(top_srcdir)/applications/jpip/libopenjpip \\r
 -I$(top_builddir)/applications/jpip/libopenjpip \\r
 -I$(top_srcdir)/applications/jpip/libopenjpip/tools \\r
 -I$(top_builddir)/applications/jpip/libopenjpip/tools\r
-jpt_to_j2k_CFLAGS = \r
-jpt_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la\r
-jpt_to_j2k_SOURCES = jpt_to_j2k.c\r
+jpip_to_j2k_CFLAGS = \r
+jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la\r
+jpip_to_j2k_SOURCES = jpip_to_j2k.c\r
 \r
 test_index_CPPFLAGS = \\r
 -I. \\r
@@ -43,7 +43,7 @@ addXMLinJP2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_lo
 addXMLinJP2_SOURCES = addXMLinJP2.c\r
 \r
 install-data-hook:\r
-       @echo -e " (B)\t$(bindir)/jpt_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt\r
-       @echo -e " (B)\t$(bindir)/jpt_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt\r
+       @echo -e " (B)\t$(bindir)/jpip_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt\r
+       @echo -e " (B)\t$(bindir)/jpip_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt\r
        @echo -e " (B)\t$(bindir)/test_index$(EXEEXT)" >> $(top_builddir)/report.txt\r
        @echo -e " (B)\t$(bindir)/addXMLinJP2$(EXEEXT)" >> $(top_builddir)/report.txt\r

diff --git a/applications/jpip/tools/jpip_to_jp2.c b/applications/jpip/tools/jpip_to_jp2.c
index 7be7ef91ebda9227fd21b2a66bec256d3f4c99a3..979ddaf90502fbcbdd3e327ff9e111c664d83fc3 100644 (file)
--- 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 <stdio.h>