adapt makefiles to the new structure

diff --git a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
index 56c4c7af031dcd25d548420a4a3fdc5775298515..10e9aa5c57b3a95e579cf66485f80b926118959b 100644 (file)
--- a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
+++ b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
@@ -5,6 +5,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/opj_dec_server.c
 ${CMAKE_CURRENT_SOURCE_DIR}/jp2k_decoder.c
 ${CMAKE_CURRENT_SOURCE_DIR}/imgsock_manager.c
 ${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c
+${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c
 )
 
 INCLUDE_DIRECTORIES(

diff --git a/applications/jpip/opj_client/opj_dec_server/Makefile.am b/applications/jpip/opj_client/opj_dec_server/Makefile.am
index 96c10ebe4990a5cd798eb08aea08bda55cbe8b76..b9e32c92b67c39b038978c499cb25c407220d3c8 100644 (file)
--- a/applications/jpip/opj_client/opj_dec_server/Makefile.am
+++ b/applications/jpip/opj_client/opj_dec_server/Makefile.am
@@ -20,10 +20,12 @@ cache_manager.h \
 imgsock_manager.c \
 imgsock_manager.h \
 jp2k_decoder.c \
+dec_clientmsg_handler.c \
+dec_clientmsg_handler.h \
 jp2k_decoder.h \
 jpipstream_manager.c \
 jpipstream_manager.h \
-opj_dec_server.c
+opj_dec_server.c 
 
 
 install-data-hook:

diff --git a/applications/jpip/opj_server/CMakeLists.txt b/applications/jpip/opj_server/CMakeLists.txt
index 29007e1b7c73a9135941bb6b5adc081c71e50dcf..e0ed5469f7454af4aa085611f651f5b0b725f2b8 100644 (file)
--- a/applications/jpip/opj_server/CMakeLists.txt
+++ b/applications/jpip/opj_server/CMakeLists.txt
@@ -10,6 +10,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c
 ${CMAKE_CURRENT_SOURCE_DIR}/query_parser.c
 ${CMAKE_CURRENT_SOURCE_DIR}/channel_manager.c
 ${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c
+${CMAKE_CURRENT_SOURCE_DIR}/jpip_parser.c
 )
 
 # Build executable

diff --git a/applications/jpip/opj_server/Makefile.am b/applications/jpip/opj_server/Makefile.am
index 9fa75b7942c5ed5ed1b7a2f72068273bbf41fc51..cb03c9ced22c5ba75f48baa6c2d7b4180aafd4a9 100644 (file)
--- a/applications/jpip/opj_server/Makefile.am
+++ b/applications/jpip/opj_server/Makefile.am
@@ -18,9 +18,11 @@ channel_manager.c \
 opj_server.c \
 query_parser.c \
 session_manager.c \
+jpip_parser.c \
 channel_manager.h \
 query_parser.h \
-session_manager.h
+session_manager.h \
+jpip_parser.h
 
 install-data-hook:
        @echo -e " (B)\t$(bindir)/opj_server$(EXEEXT)" >> $(top_builddir)/report.txt