[trunk][JPIP] additional patches for autotools and cmake

diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 87b2949feb27aa404bc60f83ab3b4a3d13971353..04a7ed78fb3deb204e08ede3ee8744035c5224c5 100644 (file)
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPIP
 ! : changed
 + : added
 
+November 2, 2011
+* [antonin] additional patches for autotools and cmake
+
 October 26, 2011
 * [kaori] additional patches for autotool are applied
 

diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/applications/jpip/libopenjpip/CMakeLists.txt
index 26631cfe921a0c224e8234f8d3ced2181f588edb..d56fba4a4c14ddf88390ed2e69bf1cf76d9b0382 100644 (file)
--- a/applications/jpip/libopenjpip/CMakeLists.txt
+++ b/applications/jpip/libopenjpip/CMakeLists.txt
@@ -1,6 +1,7 @@
 INCLUDE_REGULAR_EXPRESSION("^.*$")
 
 INCLUDE_DIRECTORIES(
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
   ${FCGI_INCLUDE_DIRNAME}
 )
 
@@ -41,6 +42,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c
 
 # Build the library
 ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS})
+TARGET_LINK_LIBRARIES(openjpip_local ${OPENJPEG_LIBRARY_NAME})
 
 ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS})
 TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME})

diff --git a/applications/jpip/libopenjpip/Makefile.am b/applications/jpip/libopenjpip/Makefile.am
index 3ddd11e516ad0f91a57c23e36231553d725ee79f..68a72576b0e7a8d2aad313b16b90f580c100f426 100644 (file)
--- a/applications/jpip/libopenjpip/Makefile.am
+++ b/applications/jpip/libopenjpip/Makefile.am
@@ -76,10 +76,12 @@ libopenjpip_server_la_SOURCES = $(JPIP_SRC)
 
 libopenjpip_local_la_CPPFLAGS = \
 -I. \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
 -I$(top_srcdir)/applications/jpip/libopenjpip \
 -I$(top_builddir)/applications/jpip/libopenjpip
 libopenjpip_local_la_CFLAGS =
-libopenjpip_local_la_LIBADD = -lm
+libopenjpip_local_la_LIBADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
 libopenjpip_local_la_LDFLAGS = -no-undefined -version-info @lt_version@
 libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC)
 

diff --git a/applications/jpip/util/CMakeLists.txt b/applications/jpip/util/CMakeLists.txt
index d8bedeeba3a11a445ff5eb211189c0acd783fefb..eba94e378a410c243b9561a144b0b7b82074872b 100644 (file)
--- a/applications/jpip/util/CMakeLists.txt
+++ b/applications/jpip/util/CMakeLists.txt
@@ -30,7 +30,7 @@ REMOVE_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP")
 FOREACH(exe opj_dec_server jpip_to_jp2 jpip_to_j2k test_index)
 #
  ADD_EXECUTABLE(${exe} ${exe}.c)
- TARGET_LINK_LIBRARIES(${exe} openjpip_local ${OPENJPEG_LIBRARY_NAME})
+ TARGET_LINK_LIBRARIES(${exe} openjpip_local)
   INSTALL(TARGETS ${exe}
    EXPORT OpenJPEGTargets
    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications

diff --git a/applications/jpip/util/Makefile.am b/applications/jpip/util/Makefile.am
index 0f60208407faa5d24fbddea56e1480787b498869..9e439d9bdbc9d7efc52634406ca9447ff48b292f 100644 (file)
--- a/applications/jpip/util/Makefile.am
+++ b/applications/jpip/util/Makefile.am
@@ -8,7 +8,7 @@ opj_server_CPPFLAGS = \
 -I$(top_srcdir)/applications/jpip/libopenjpip \
 -I$(top_builddir)/applications/jpip/libopenjpip
 #
-opj_server_CFLAGS = -m32 -DServer -DQUIT_SIGNAL=\"quitJPIP\"
+opj_server_CFLAGS = -DServer -DQUIT_SIGNAL=\"quitJPIP\"
 #
 opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm
 #
@@ -21,7 +21,7 @@ opj_dec_server_CPPFLAGS = \
 -I$(top_builddir)/applications/jpip/libopenjpip
 #
 opj_dec_server_CFLAGS =
-opj_dec_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la
+opj_dec_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 opj_dec_server_SOURCES = opj_dec_server.c
 #-------------
 jpip_to_jp2_CPPFLAGS = \
@@ -30,7 +30,7 @@ jpip_to_jp2_CPPFLAGS = \
 -I$(top_builddir)/applications/jpip/libopenjpip
 #
 jpip_to_jp2_CFLAGS =
-jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la
+jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 jpip_to_jp2_SOURCES = jpip_to_jp2.c
 #-------------
 jpip_to_j2k_CPPFLAGS = \
@@ -39,7 +39,7 @@ jpip_to_j2k_CPPFLAGS = \
 -I$(top_builddir)/applications/jpip/libopenjpip
 #
 jpip_to_j2k_CFLAGS =
-jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la
+jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 jpip_to_j2k_SOURCES = jpip_to_j2k.c
 #-------------
 test_index_CPPFLAGS = \
@@ -48,7 +48,7 @@ test_index_CPPFLAGS = \
 -I$(top_builddir)/applications/jpip/libopenjpip
 #
 test_index_CFLAGS =
-test_index_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la
+test_index_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 test_index_SOURCES = test_index.c
 #-------------
 install-data-hook: