From 436318a8c845bcaaa4a28acbdb8334c8c6f2588c Mon Sep 17 00:00:00 2001 From: Kaori Hagihara Date: Tue, 18 Oct 2011 14:31:06 +0000 Subject: [PATCH] adapt makefiles to the new structure --- applications/jpip/opj_client/opj_dec_server/CMakeLists.txt | 1 + applications/jpip/opj_client/opj_dec_server/Makefile.am | 4 +++- applications/jpip/opj_server/CMakeLists.txt | 1 + applications/jpip/opj_server/Makefile.am | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt index 56c4c7af..10e9aa5c 100644 --- 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 96c10ebe..b9e32c92 100644 --- 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 29007e1b..e0ed5469 100644 --- 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 9fa75b79..cb03c9ce 100644 --- 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