diff --git a/CHANGES b/CHANGES index 639fd2e1..3cc126e8 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,12 @@ What's New for OpenJPEG ! : changed + : added +October 22, 2010 ++ [szukw000] added 'libopenjpeg.pc.in' +! [szukw000] changed 'configure.ac' to create 'libopenjpeg.pc' +! [szukw000] changed 'Makefile.am' to [un]install 'libopenjpeg.pc' +! [szukw000] changed 'doc/Makefile.am' : 'uninstall-hook' added + October 20, 2010 * [antonin] fixed help display (patch from winfried) diff --git a/Makefile.am b/Makefile.am index 20af0c66..9d5aa9b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,20 @@ clean-local: distclean-local: clean-local +pkgconf_dir = /usr/lib/pkgconfig + install-data-hook: @echo "" @l='$(SUBDIRS)'; for f in $$l ; do \ cat $$f/.report.txt ; \ done @echo "" + @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)" + @echo "" + @$(INSTALL) -d $(pkgconf_dir) + @cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc + @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \ + $(LN_S) libopenjpeg1.pc libopenjpeg.pc) + +uninstall-hook: + @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc) diff --git a/Makefile.in b/Makefile.in index b992bdfb..966eda6c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,9 +36,9 @@ host_triplet = @host@ target_triplet = @target@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/opj_config.h.in \ - $(top_srcdir)/configure INSTALL config.guess config.sub \ - depcomp install-sh ltmain.sh missing + $(srcdir)/Makefile.in $(srcdir)/libopenjpeg.pc.in \ + $(srcdir)/opj_config.h.in $(top_srcdir)/configure INSTALL \ + config.guess config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -47,7 +47,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = opj_config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = libopenjpeg.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -247,6 +247,7 @@ with_doxygen = @with_doxygen@ #OpenJPEG top source directory SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc +pkgconf_dir = /usr/lib/pkgconfig all: opj_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -302,6 +303,8 @@ $(srcdir)/opj_config.h.in: $(am__configure_deps) distclean-hdr: -rm -f opj_config.h stamp-h1 +libopenjpeg.pc: $(top_builddir)/config.status $(srcdir)/libopenjpeg.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -722,10 +725,11 @@ ps: ps-recursive ps-am: uninstall-am: - + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ctags-recursive install-am install-data-am install-strip \ - tags-recursive + tags-recursive uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ @@ -742,7 +746,7 @@ uninstall-am: installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am + tags tags-recursive uninstall uninstall-am uninstall-hook clean-local: @@ -759,6 +763,15 @@ install-data-hook: cat $$f/.report.txt ; \ done @echo "" + @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)" + @echo "" + @$(INSTALL) -d $(pkgconf_dir) + @cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc + @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \ + $(LN_S) libopenjpeg1.pc libopenjpeg.pc) + +uninstall-hook: + @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/configure b/configure index 43cff88e..74b35626 100755 --- a/configure +++ b/configure @@ -16156,6 +16156,8 @@ fi # ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files libopenjpeg.pc" + ac_config_files="$ac_config_files libopenjpeg/Makefile" ac_config_files="$ac_config_files jpwl/Makefile" @@ -17276,6 +17278,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "libopenjpeg.pc") CONFIG_FILES="$CONFIG_FILES libopenjpeg.pc" ;; "libopenjpeg/Makefile") CONFIG_FILES="$CONFIG_FILES libopenjpeg/Makefile" ;; "jpwl/Makefile") CONFIG_FILES="$CONFIG_FILES jpwl/Makefile" ;; "codec/Makefile") CONFIG_FILES="$CONFIG_FILES codec/Makefile" ;; diff --git a/configure.ac b/configure.ac index 83c30ebe..51e91f4f 100644 --- a/configure.ac +++ b/configure.ac @@ -423,6 +423,7 @@ AC_CHECK_PROG(with_doxygen, doxygen, [yes],[no],,) AM_CONDITIONAL([with_doxygen], [test x$with_doxygen = xyes]) # AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([libopenjpeg.pc]) AC_CONFIG_FILES([libopenjpeg/Makefile]) AC_CONFIG_FILES([jpwl/Makefile]) AC_CONFIG_FILES([codec/Makefile]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 5cf2ecd3..809c8011 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,26 +16,34 @@ all-local: @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt - cp man/man1/* . - cp man/man3/* . + @cp man/man1/* . + @cp man/man3/* . install-data-hook: $(INSTALL) -d $(doc_dir) $(INSTALL) -d ${mandir}/man1 ${mandir}/man3 if with_libjpwl - (cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) - (cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) + @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) + @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) endif - (cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) - (cd ${mandir}/man3 && $(RM) libopenjpeg* ) - gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 - cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 - cp libopenjpeg.3.gz ${mandir}/man3 - $(RM) *\.gz + @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) + @(cd ${mandir}/man3 && $(RM) libopenjpeg* ) + @gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 + @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 + @cp libopenjpeg.3.gz ${mandir}/man3 + @$(RM) *\.gz if with_libjpwl - (cd ${mandir}/man1 && \ + @(cd ${mandir}/man1 && \ $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) - (cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) + @(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) endif - cp ../LICENSE ../CHANGES $(doc_dir) + @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir) + +uninstall-hook: + @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \ + $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) + @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \ + $(RM) libopenjpeg* ) + @(cd $(doc_dir) && $(RM) * ) + @rmdir $(doc_dir) diff --git a/doc/Makefile.in b/doc/Makefile.in index 8218cc3d..075d499e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -364,8 +364,9 @@ ps: ps-am ps-am: uninstall-am: - -.MAKE: install-am install-data-am install-strip + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: install-am install-data-am install-strip uninstall-am .PHONY: all all-am all-local check check-am clean clean-generic \ clean-libtool distclean distclean-generic distclean-libtool \ @@ -377,7 +378,7 @@ uninstall-am: install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am + ps ps-am uninstall uninstall-am uninstall-hook @with_doxygen_TRUE@docs: @@ -390,25 +391,33 @@ all-local: @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt - cp man/man1/* . - cp man/man3/* . + @cp man/man1/* . + @cp man/man3/* . install-data-hook: $(INSTALL) -d $(doc_dir) $(INSTALL) -d ${mandir}/man1 ${mandir}/man3 -@with_libjpwl_TRUE@ (cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) -@with_libjpwl_TRUE@ (cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) - (cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) - (cd ${mandir}/man3 && $(RM) libopenjpeg* ) - gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 - cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 - cp libopenjpeg.3.gz ${mandir}/man3 - $(RM) *\.gz -@with_libjpwl_TRUE@ (cd ${mandir}/man1 && \ +@with_libjpwl_TRUE@ @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) +@with_libjpwl_TRUE@ @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) + @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) + @(cd ${mandir}/man3 && $(RM) libopenjpeg* ) + @gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 + @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 + @cp libopenjpeg.3.gz ${mandir}/man3 + @$(RM) *\.gz +@with_libjpwl_TRUE@ @(cd ${mandir}/man1 && \ @with_libjpwl_TRUE@ $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ @with_libjpwl_TRUE@ $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) -@with_libjpwl_TRUE@ (cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) - cp ../LICENSE ../CHANGES $(doc_dir) +@with_libjpwl_TRUE@ @(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) + @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir) + +uninstall-hook: + @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \ + $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) + @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \ + $(RM) libopenjpeg* ) + @(cd $(doc_dir) && $(RM) * ) + @rmdir $(doc_dir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libopenjpeg.pc.in b/libopenjpeg.pc.in new file mode 100644 index 00000000..e75e2bd4 --- /dev/null +++ b/libopenjpeg.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: openjpeg +Description: JPEG2000 files library +URL: http://code.google.com/p/openjpeg/ +Version: @VERSION@ +Libs: -L${libdir} -lopenjpeg +Cflags: -I${includedir}