From 0f101066f2fe3b1589114a26a10064ea3055d0b2 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 13 Jul 2011 16:29:22 +0000 Subject: [PATCH] * added 'libopenjpeg-jpwl.pc.in' * fixed substitution in libopenjpeg1.pc.in * increase micro version to 99. When released, set minor to 5 and micro to 0 * added -lm to the linker for libopenjpeg and to the .pc file * removed useless LCMS flags from Makefile.am for libopenjpeg --- CHANGES | 8 ++++++++ Makefile.am | 7 +++++++ configure.ac | 18 +++++------------- libopenjpeg-jpwl.pc.in | 13 +++++++++++++ libopenjpeg/Makefile.am | 6 ++---- libopenjpeg1.pc.in | 5 +++-- 6 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 libopenjpeg-jpwl.pc.in diff --git a/CHANGES b/CHANGES index 94175175..bcb14836 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,14 @@ What's New for OpenJPEG _______ R812 : 'openjpeg-1.5' branch created ______________________________ +July 13, 2011 ++ [vtorri] added 'libopenjpeg-jpwl.pc.in' +* [vtorri] fixed substitution in libopenjpeg1.pc.in +! [vtorri] increase micro version to 99. When released, set minor to 5 and micro to 0 +* [vtorri] added -lm to the linker for libopenjpeg and to the .pc file +- [vtorri] removed useless LCMS flags from Makefile.am for libopenjpeg + + July 10, 2011 ! [antonin] improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa) diff --git a/Makefile.am b/Makefile.am index 84a03325..c23ddbb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,10 @@ SUBDIRS = libopenjpeg applications doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libopenjpeg1.pc +if WANT_JPWL +pkgconfig_DATA += libopenjpeg-jpwl.pc +endif + MAINTAINERCLEANFILES = \ Makefile.in \ @@ -52,6 +56,9 @@ install-data-hook: $(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc @echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt @echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt +if WANT_JPWL + @echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg-jpwl.pc" >> $(top_builddir)/report.txt +endif @cat $(top_builddir)/report.txt @rm $(top_builddir)/report.txt diff --git a/configure.ac b/configure.ac index baefa964..acd998c9 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ m4_define([OPJ_MAJOR], [1]) m4_define([OPJ_MINOR], [4]) -m4_define([OPJ_MICRO], [0]) +m4_define([OPJ_MICRO], [99]) m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR)) m4_define([lt_rev], OPJ_MICRO) @@ -364,10 +364,7 @@ AC_MSG_RESULT([${want_lcms2}]) if test "x${want_lcms2}" = "xyes" ; then PKG_CHECK_MODULES([LCMS2], [lcms2], - [ - have_lcms2="yes" - requirements="lcms2" - ], + [have_lcms2="yes"], [have_lcms2="no"]) fi @@ -399,15 +396,9 @@ if test "x${have_lcms2}" = "xno" ; then if test "x${want_lcms1}" = "xyes" ; then PKG_CHECK_MODULES([LCMS1], [lcms1], - [ - have_lcms1="yes" - requirements="lcms1" - ], + [have_lcms1="yes"], [PKG_CHECK_MODULES([LCMS1], [lcms], - [ - have_lcms1="yes" - requirements="lcms" - ], + [have_lcms1="yes"], [have_lcms1="no"])]) fi @@ -459,6 +450,7 @@ fi AC_CONFIG_FILES([ Makefile libopenjpeg1.pc +libopenjpeg-jpwl.pc libopenjpeg/Makefile libopenjpeg/jpwl/Makefile applications/Makefile diff --git a/libopenjpeg-jpwl.pc.in b/libopenjpeg-jpwl.pc.in new file mode 100644 index 00000000..ae73add4 --- /dev/null +++ b/libopenjpeg-jpwl.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: openjpeg +Description: JPEG2000 Wireless (Part 11 - JPWL) library +URL: http://www.openjpeg.org/ +Version: @VERSION@ +@pkgconfig_requires_private@: @requirements@ +Libs: -L${libdir} -lopenjpeg_JPWL +Libs.private: -lm +Cflags: -I${includedir} diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am index c0dd1639..e0b366cf 100644 --- a/libopenjpeg/Makefile.am +++ b/libopenjpeg/Makefile.am @@ -14,11 +14,9 @@ lib_LTLIBRARIES = libopenjpeg.la libopenjpeg_la_CPPFLAGS = \ -I. \ -I$(top_srcdir)/libopenjpeg \ --I$(top_builddir)/libopenjpeg \ -@LCMS1_CFLAGS@ \ -@LCMS2_CFLAGS@ +-I$(top_builddir)/libopenjpeg libopenjpeg_la_CFLAGS = -libopenjpeg_la_LIBADD = @LCMS1_LIBS@ @LCMS2_LIBS@ +libopenjpeg_la_LIBADD = -lm libopenjpeg_la_LDFLAGS = -no-undefined -version-info @lt_version@ libopenjpeg_la_SOURCES = \ diff --git a/libopenjpeg1.pc.in b/libopenjpeg1.pc.in index 2951608f..ce4f770a 100644 --- a/libopenjpeg1.pc.in +++ b/libopenjpeg1.pc.in @@ -4,9 +4,10 @@ libdir=@libdir@ includedir=@includedir@ Name: openjpeg -Description: JPEG2000 files library +Description: JPEG2000 library URL: http://www.openjpeg.org/ Version: @VERSION@ -pkgconfig_requires_private: @requirements@ +@pkgconfig_requires_private@: @requirements@ Libs: -L${libdir} -lopenjpeg +Libs.private: -lm Cflags: -I${includedir}