walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

This commit is contained in:
Antonin Descampe 2011-11-02 00:54:19 +00:00
parent 83a25c06ef
commit 46367a7a7b
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/jpip/CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPIP
! : changed ! : changed
+ : added + : added
November 2, 2011
* [antonin] additional patches for autotools and cmake
October 26, 2011 October 26, 2011
* [kaori] additional patches for autotool are applied * [kaori] additional patches for autotool are applied

2
applications/jpip/libopenjpip/CMakeLists.txt
View File

@ -1,6 +1,7 @@
INCLUDE_REGULAR_EXPRESSION("^.*$") INCLUDE_REGULAR_EXPRESSION("^.*$")
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/libopenjpeg
${FCGI_INCLUDE_DIRNAME} ${FCGI_INCLUDE_DIRNAME}
) )
@ -41,6 +42,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c
# Build the library # Build the library
ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS}) ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS})
TARGET_LINK_LIBRARIES(openjpip_local ${OPENJPEG_LIBRARY_NAME})
ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS}) ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS})
TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME}) TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME})

4
applications/jpip/libopenjpip/Makefile.am
View File

@ -76,10 +76,12 @@ libopenjpip_server_la_SOURCES = $(JPIP_SRC)
libopenjpip_local_la_CPPFLAGS = \ libopenjpip_local_la_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/libopenjpeg \
-I$(top_builddir)/libopenjpeg \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
libopenjpip_local_la_CFLAGS = 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_LDFLAGS = -no-undefined -version-info @lt_version@
libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC) libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC)

2
applications/jpip/util/CMakeLists.txt
View File

@ -30,7 +30,7 @@ REMOVE_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP")
FOREACH(exe opj_dec_server jpip_to_jp2 jpip_to_j2k test_index) FOREACH(exe opj_dec_server jpip_to_jp2 jpip_to_j2k test_index)
# #
ADD_EXECUTABLE(${exe} ${exe}.c) ADD_EXECUTABLE(${exe} ${exe}.c)
TARGET_LINK_LIBRARIES(${exe} openjpip_local ${OPENJPEG_LIBRARY_NAME}) TARGET_LINK_LIBRARIES(${exe} openjpip_local)
INSTALL(TARGETS ${exe} INSTALL(TARGETS ${exe}
EXPORT OpenJPEGTargets EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications

10
applications/jpip/util/Makefile.am
View File

@ -8,7 +8,7 @@ opj_server_CPPFLAGS = \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/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 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 -I$(top_builddir)/applications/jpip/libopenjpip
# #
opj_dec_server_CFLAGS = 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 opj_dec_server_SOURCES = opj_dec_server.c
#------------- #-------------
jpip_to_jp2_CPPFLAGS = \ jpip_to_jp2_CPPFLAGS = \
@ -30,7 +30,7 @@ jpip_to_jp2_CPPFLAGS = \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
# #
jpip_to_jp2_CFLAGS = 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_jp2_SOURCES = jpip_to_jp2.c
#------------- #-------------
jpip_to_j2k_CPPFLAGS = \ jpip_to_j2k_CPPFLAGS = \
@ -39,7 +39,7 @@ jpip_to_j2k_CPPFLAGS = \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
# #
jpip_to_j2k_CFLAGS = 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 jpip_to_j2k_SOURCES = jpip_to_j2k.c
#------------- #-------------
test_index_CPPFLAGS = \ test_index_CPPFLAGS = \
@ -48,7 +48,7 @@ test_index_CPPFLAGS = \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
# #
test_index_CFLAGS = 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 test_index_SOURCES = test_index.c
#------------- #-------------
install-data-hook: install-data-hook: