[1.5] fix output when --disable-shared or --disable-static is

passed to configure. Minor fix for jpwl compilation.
This commit is contained in:
Vincent Torri 2011-10-01 04:55:00 +00:00
parent 5d6ac5ea72
commit fb82b6d7d9
5 changed files with 27 additions and 5 deletions

View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
October 1, 2011
+ [vincent] fix output when --disable-shared or --disable-static is passed to configure. Minor fix for jpwl compilation.
September 9, 2011 September 9, 2011
+ [antonin] added a new indexer functionality to the library. With the new '-jpip' option at encoding, the user can now generate a JP2 file including an XML box with the index used when browsing the image with JPIP. + [antonin] added a new indexer functionality to the library. With the new '-jpip' option at encoding, the user can now generate a JP2 file including an XML box with the index used when browsing the image with JPIP.

View File

@ -62,11 +62,19 @@ libopenjpip_local_la_SOURCES = $(JPIP_SRC)
install-data-hook: install-data-hook:
@echo -e " (LA)\t$(libdir)/libopenjpip_server.la" >> $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpip_server.la" >> $(top_builddir)/report.txt
if BUILD_SHARED
@( $(call solist_s) ) >> $(top_builddir)/report.txt @( $(call solist_s) ) >> $(top_builddir)/report.txt
endif
if BUILD_STATIC
@echo -e " (A)\t$(base_s)/$(a_s)" >> $(top_builddir)/report.txt @echo -e " (A)\t$(base_s)/$(a_s)" >> $(top_builddir)/report.txt
endif
@echo -e " (LA)\t$(libdir)/libopenjpip_local.la" >> $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpip_local.la" >> $(top_builddir)/report.txt
if BUILD_SHARED
@( $(call solist_c) ) >> $(top_builddir)/report.txt @( $(call solist_c) ) >> $(top_builddir)/report.txt
endif
if BUILD_STATIC
@echo -e " (A)\t$(base_c)/$(a_c)" >> $(top_builddir)/report.txt @echo -e " (A)\t$(base_c)/$(a_c)" >> $(top_builddir)/report.txt
endif
solist_s = $(foreach f, $(dll_s) $(so_s), echo -e ' $(SO_PREFIX)\t$(base_s)/$(f)' ;) solist_s = $(foreach f, $(dll_s) $(so_s), echo -e ' $(SO_PREFIX)\t$(base_s)/$(f)' ;)
get_tok_s = $(shell grep -E "^$(1)=" libopenjpip_server.la | cut -d "'" -f 2) get_tok_s = $(shell grep -E "^$(1)=" libopenjpip_server.la | cut -d "'" -f 2)

View File

@ -116,10 +116,6 @@ AC_ARG_ENABLE([jpwl],
AC_MSG_CHECKING([whether to build the JPWL library]) AC_MSG_CHECKING([whether to build the JPWL library])
AC_MSG_RESULT([${want_jpwl}]) AC_MSG_RESULT([${want_jpwl}])
if test "x${want_jpwl}" = "xyes" ; then
AC_DEFINE(USE_JPWL, [1], [define to 1 if you use jpwl])
fi
AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"]) AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"])
# JPIP # JPIP
@ -397,6 +393,13 @@ fi
### Checks for library functions ### Checks for library functions
### Post configuration
AM_CONDITIONAL([BUILD_SHARED], [test "x${enable_shared}" = "xyes"])
AM_CONDITIONAL([BUILD_STATIC], [test "x${enable_static}" = "xyes"])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
libopenjpeg1.pc libopenjpeg1.pc

View File

@ -78,8 +78,12 @@ install-data-hook:
openjpeg.h openjpeg.h
@rm -rf $(top_builddir)/report.txt @rm -rf $(top_builddir)/report.txt
@echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
if BUILD_SHARED
@( $(call solist) ) >> $(top_builddir)/report.txt @( $(call solist) ) >> $(top_builddir)/report.txt
endif
if BUILD_STATIC
@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
endif
@echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt @echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt
@echo -e " (LN)\t$(includedir)/openjpeg.h" >> $(top_builddir)/report.txt @echo -e " (LN)\t$(includedir)/openjpeg.h" >> $(top_builddir)/report.txt

View File

@ -26,7 +26,7 @@ OPJ_SRC = \
../phix_manager.c \ ../phix_manager.c \
../ppix_manager.c \ ../ppix_manager.c \
../thix_manager.c \ ../thix_manager.c \
../tpix_manager.c ../tpix_manager.c
libopenjpeg_JPWL_la_CPPFLAGS = \ libopenjpeg_JPWL_la_CPPFLAGS = \
-I. \ -I. \
@ -50,8 +50,12 @@ rs.h
install-data-hook: install-data-hook:
@echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt
if BUILD_SHARED
@( $(call solist) ) >> $(top_builddir)/report.txt @( $(call solist) ) >> $(top_builddir)/report.txt
endif
if BUILD_STATIC
@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
endif
solist = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;) solist = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
get_tok = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2) get_tok = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)