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

M configure 

M    Makefile.in
M    configure.ac
A    libopenjpeg.pc.in
M    doc/Makefile.in
M    doc/Makefile.am
M    CHANGES
M    Makefile.am
This commit is contained in:
Winfried 2010-10-22 03:07:12 +00:00
parent c515199674
commit fc668f3ec3
8 changed files with 98 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -5,6 +5,12 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : 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 October 20, 2010
* [antonin] fixed help display (patch from winfried) * [antonin] fixed help display (patch from winfried)

11
Makefile.am
View File

@ -9,9 +9,20 @@ clean-local:
distclean-local: clean-local distclean-local: clean-local
pkgconf_dir = /usr/lib/pkgconfig
install-data-hook: install-data-hook:
@echo "" @echo ""
@l='$(SUBDIRS)'; for f in $$l ; do \ @l='$(SUBDIRS)'; for f in $$l ; do \
cat $$f/.report.txt ; \ cat $$f/.report.txt ; \
done done
@echo "" @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)

27
Makefile.in
View File

@ -36,9 +36,9 @@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
subdir = . subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/opj_config.h.in \ $(srcdir)/Makefile.in $(srcdir)/libopenjpeg.pc.in \
$(top_srcdir)/configure INSTALL config.guess config.sub \ $(srcdir)/opj_config.h.in $(top_srcdir)/configure INSTALL \
depcomp install-sh ltmain.sh missing config.guess config.sub depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 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 configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = opj_config.h CONFIG_HEADER = opj_config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES = libopenjpeg.pc
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
@ -247,6 +247,7 @@ with_doxygen = @with_doxygen@
#OpenJPEG top source directory #OpenJPEG top source directory
SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc
pkgconf_dir = /usr/lib/pkgconfig
all: opj_config.h all: opj_config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -302,6 +303,8 @@ $(srcdir)/opj_config.h.in: $(am__configure_deps)
distclean-hdr: distclean-hdr:
-rm -f opj_config.h stamp-h1 -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: mostlyclean-libtool:
-rm -f *.lo -rm -f *.lo
@ -722,10 +725,11 @@ ps: ps-recursive
ps-am: ps-am:
uninstall-am: uninstall-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
ctags-recursive install-am install-data-am install-strip \ ctags-recursive install-am install-data-am install-strip \
tags-recursive tags-recursive uninstall-am
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \ all all-am am--refresh check check-am clean clean-generic \
@ -742,7 +746,7 @@ uninstall-am:
installcheck installcheck-am installdirs installdirs-am \ installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 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: clean-local:
@ -759,6 +763,15 @@ install-data-hook:
cat $$f/.report.txt ; \ cat $$f/.report.txt ; \
done done
@echo "" @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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

3
configure vendored
View File

@ -16156,6 +16156,8 @@ fi
# #
ac_config_files="$ac_config_files Makefile" 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 libopenjpeg/Makefile"
ac_config_files="$ac_config_files jpwl/Makefile" ac_config_files="$ac_config_files jpwl/Makefile"
@ -17276,6 +17278,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libopenjpeg.pc") CONFIG_FILES="$CONFIG_FILES libopenjpeg.pc" ;;
"libopenjpeg/Makefile") CONFIG_FILES="$CONFIG_FILES libopenjpeg/Makefile" ;; "libopenjpeg/Makefile") CONFIG_FILES="$CONFIG_FILES libopenjpeg/Makefile" ;;
"jpwl/Makefile") CONFIG_FILES="$CONFIG_FILES jpwl/Makefile" ;; "jpwl/Makefile") CONFIG_FILES="$CONFIG_FILES jpwl/Makefile" ;;
"codec/Makefile") CONFIG_FILES="$CONFIG_FILES codec/Makefile" ;; "codec/Makefile") CONFIG_FILES="$CONFIG_FILES codec/Makefile" ;;

1
configure.ac
View File

@ -423,6 +423,7 @@ AC_CHECK_PROG(with_doxygen, doxygen, [yes],[no],,)
AM_CONDITIONAL([with_doxygen], [test x$with_doxygen = xyes]) AM_CONDITIONAL([with_doxygen], [test x$with_doxygen = xyes])
# #
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([libopenjpeg.pc])
AC_CONFIG_FILES([libopenjpeg/Makefile]) AC_CONFIG_FILES([libopenjpeg/Makefile])
AC_CONFIG_FILES([jpwl/Makefile]) AC_CONFIG_FILES([jpwl/Makefile])
AC_CONFIG_FILES([codec/Makefile]) AC_CONFIG_FILES([codec/Makefile])

34
doc/Makefile.am
View File

@ -16,26 +16,34 @@ all-local:
@echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt
@echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt
@echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt
cp man/man1/* . @cp man/man1/* .
cp man/man3/* . @cp man/man3/* .
install-data-hook: install-data-hook:
$(INSTALL) -d $(doc_dir) $(INSTALL) -d $(doc_dir)
$(INSTALL) -d ${mandir}/man1 ${mandir}/man3 $(INSTALL) -d ${mandir}/man1 ${mandir}/man3
if with_libjpwl if with_libjpwl
(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
endif endif
(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
(cd ${mandir}/man3 && $(RM) libopenjpeg* ) @(cd ${mandir}/man3 && $(RM) libopenjpeg* )
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 @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 image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
cp libopenjpeg.3.gz ${mandir}/man3 @cp libopenjpeg.3.gz ${mandir}/man3
$(RM) *\.gz @$(RM) *\.gz
if with_libjpwl if with_libjpwl
(cd ${mandir}/man1 && \ @(cd ${mandir}/man1 && \
$(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ $(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) $(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 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)

41
doc/Makefile.in
View File

@ -364,8 +364,9 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-am:
@$(NORMAL_INSTALL)
.MAKE: install-am install-data-am install-strip $(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 \ .PHONY: all all-am all-local check check-am clean clean-generic \
clean-libtool distclean distclean-generic distclean-libtool \ clean-libtool distclean distclean-generic distclean-libtool \
@ -377,7 +378,7 @@ uninstall-am:
install-ps-am install-strip installcheck installcheck-am \ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \ installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ 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: @with_doxygen_TRUE@docs:
@ -390,25 +391,33 @@ all-local:
@echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt
@echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt
@echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt
cp man/man1/* . @cp man/man1/* .
cp man/man3/* . @cp man/man3/* .
install-data-hook: install-data-hook:
$(INSTALL) -d $(doc_dir) $(INSTALL) -d $(doc_dir)
$(INSTALL) -d ${mandir}/man1 ${mandir}/man3 $(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}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
@with_libjpwl_TRUE@ (cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) @with_libjpwl_TRUE@ @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
(cd ${mandir}/man3 && $(RM) libopenjpeg* ) @(cd ${mandir}/man3 && $(RM) libopenjpeg* )
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 @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 image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
cp libopenjpeg.3.gz ${mandir}/man3 @cp libopenjpeg.3.gz ${mandir}/man3
$(RM) *\.gz @$(RM) *\.gz
@with_libjpwl_TRUE@ (cd ${mandir}/man1 && \ @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) 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@ $(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) @with_libjpwl_TRUE@ @(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
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)
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

11
libopenjpeg.pc.in Normal file
View File

@ -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}