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

changed report code in Makefile.am

This commit is contained in:
Winfried 2011-01-07 03:20:58 +00:00
parent 50b3b5c991
commit 7441340ab5
17 changed files with 325 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
January 7, 2011
! [szukw000] changed report code in Makefile.am
January 3, 2011 January 3, 2011
- [antonin] removed badly written tests from CTest in 'codec/CMakeLists.txt' - [antonin] removed badly written tests from CTest in 'codec/CMakeLists.txt'

8
Makefile.am
View File

@ -3,8 +3,8 @@ SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc
clean-local: clean-local:
@rm -rf bin @rm -rf bin
@l='$(SUBDIRS)'; for f in $$l ; do \ @list='$(SUBDIRS)'; for dir in $${list} ; do \
rm -f $$f/.report.txt ; \ rm -f $${dir}/.report.txt ; \
done done
distclean-local: clean-local distclean-local: clean-local
@ -13,8 +13,8 @@ pkgconf_dir = /usr/lib/pkgconfig
install-data-hook: install-data-hook:
@echo "" @echo ""
@l='$(SUBDIRS)'; for f in $$l ; do \ @list='$(SUBDIRS)'; for dir in $${list} ; do \
cat $$f/.report.txt ; \ cat $${dir}/.report.txt ; \
done done
@echo "" @echo ""
@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)" @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"

8
Makefile.in
View File

@ -749,16 +749,16 @@ uninstall-am:
clean-local: clean-local:
@rm -rf bin @rm -rf bin
@l='$(SUBDIRS)'; for f in $$l ; do \ @list='$(SUBDIRS)'; for dir in $${list} ; do \
rm -f $$f/.report.txt ; \ rm -f $${dir}/.report.txt ; \
done done
distclean-local: clean-local distclean-local: clean-local
install-data-hook: install-data-hook:
@echo "" @echo ""
@l='$(SUBDIRS)'; for f in $$l ; do \ @list='$(SUBDIRS)'; for dir in $${list} ; do \
cat $$f/.report.txt ; \ cat $${dir}/.report.txt ; \
done done
@echo "" @echo ""
@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)" @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"

4
codec/Makefile.am
View File

@ -47,6 +47,6 @@ all-local:
$(INSTALL) -d ../bin $(INSTALL) -d ../bin
$(INSTALL) $(bin_PROGRAMS) ../bin $(INSTALL) $(bin_PROGRAMS) ../bin
@echo "" > .report.txt @echo "" > .report.txt
@for f in ${REPBIN} ; do \ @for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
done done

4
codec/Makefile.in
View File

@ -613,8 +613,8 @@ all-local:
$(INSTALL) -d ../bin $(INSTALL) -d ../bin
$(INSTALL) $(bin_PROGRAMS) ../bin $(INSTALL) $(bin_PROGRAMS) ../bin
@echo "" > .report.txt @echo "" > .report.txt
@for f in ${REPBIN} ; do \ @for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
done done
# 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.

63
configure vendored
View File

@ -612,6 +612,12 @@ with_doxygen_FALSE
with_doxygen_TRUE with_doxygen_TRUE
with_doxygen with_doxygen
jp3d_dir jp3d_dir
build_so_FALSE
build_so_TRUE
build_dylib_FALSE
build_dylib_TRUE
build_dll_FALSE
build_dll_TRUE
with_sharedlibs_FALSE with_sharedlibs_FALSE
with_sharedlibs_TRUE with_sharedlibs_TRUE
jpwl_dir jpwl_dir
@ -16080,6 +16086,51 @@ else
fi fi
# #
#
build_so="no"
build_dll="no"
build_dylib="no"
case "${host_os}" in
*cygwin*)
build_dll="yes"
;;
*mingw*)
build_dll="yes"
;;
*darwin*)
build_dylib="yes"
;;
*)
build_so="yes"
;;
esac
#
if test x$build_dll = xyes; then
build_dll_TRUE=
build_dll_FALSE='#'
else
build_dll_TRUE='#'
build_dll_FALSE=
fi
if test x$build_dylib = xyes; then
build_dylib_TRUE=
build_dylib_FALSE='#'
else
build_dylib_TRUE='#'
build_dylib_FALSE=
fi
if test x$build_so = xyes; then
build_so_TRUE=
build_so_FALSE='#'
else
build_so_TRUE='#'
build_so_FALSE=
fi
#
# ------------------------------- # -------------------------------
# Test for creating JP3D # Test for creating JP3D
# ------------------------------- # -------------------------------
@ -16309,6 +16360,18 @@ if test -z "${with_sharedlibs_TRUE}" && test -z "${with_sharedlibs_FALSE}"; then
as_fn_error "conditional \"with_sharedlibs\" was never defined. as_fn_error "conditional \"with_sharedlibs\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${build_dll_TRUE}" && test -z "${build_dll_FALSE}"; then
as_fn_error "conditional \"build_dll\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${build_dylib_TRUE}" && test -z "${build_dylib_FALSE}"; then
as_fn_error "conditional \"build_dylib\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${build_so_TRUE}" && test -z "${build_so_FALSE}"; then
as_fn_error "conditional \"build_so\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${with_doxygen_TRUE}" && test -z "${with_doxygen_FALSE}"; then if test -z "${with_doxygen_TRUE}" && test -z "${with_doxygen_FALSE}"; then
as_fn_error "conditional \"with_doxygen\" was never defined. as_fn_error "conditional \"with_doxygen\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5

24
configure.ac
View File

@ -408,6 +408,30 @@ test "$enable_shared" = "no" && with_sharedlibs="no")
AC_MSG_RESULT($with_sharedlibs) AC_MSG_RESULT($with_sharedlibs)
AM_CONDITIONAL([with_sharedlibs], [test x$with_sharedlibs = xyes]) AM_CONDITIONAL([with_sharedlibs], [test x$with_sharedlibs = xyes])
# #
#
build_so="no"
build_dll="no"
build_dylib="no"
case "${host_os}" in
*cygwin*)
build_dll="yes"
;;
*mingw*)
build_dll="yes"
;;
*darwin*)
build_dylib="yes"
;;
*)
build_so="yes"
;;
esac
#
AM_CONDITIONAL([build_dll], [test x$build_dll = xyes])
AM_CONDITIONAL([build_dylib], [test x$build_dylib = xyes])
AM_CONDITIONAL([build_so], [test x$build_so = xyes])
#
# ------------------------------- # -------------------------------
# Test for creating JP3D # Test for creating JP3D
# ------------------------------- # -------------------------------

4
jp3d/codec/Makefile.am
View File

@ -22,6 +22,6 @@ REPBIN=$(bin_PROGRAMS)
all-local: all-local:
$(INSTALL) -d ../../bin $(INSTALL) -d ../../bin
$(INSTALL) $(bin_PROGRAMS) ../../bin $(INSTALL) $(bin_PROGRAMS) ../../bin
@(for f in ${REPBIN} ; do \ @(for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$$f" >> ../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
done) done)

4
jp3d/codec/Makefile.in
View File

@ -555,8 +555,8 @@ uninstall-am: uninstall-binPROGRAMS
all-local: all-local:
$(INSTALL) -d ../../bin $(INSTALL) -d ../../bin
$(INSTALL) $(bin_PROGRAMS) ../../bin $(INSTALL) $(bin_PROGRAMS) ../../bin
@(for f in ${REPBIN} ; do \ @(for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$$f" >> ../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
done) done)
# 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.

54
jp3d/libjp3dvm/Makefile.am
View File

@ -44,21 +44,51 @@ headerdir = openjpeg3d-$(MAJOR).$(MINOR)
all-local: all-local:
@$(INSTALL) -d ../../bin @$(INSTALL) -d ../../bin
@cp -P .libs/libopenjp3dvm.* ../../bin @rm -rf .report_dir
@rm -f ../../bin/libopenjp3dvm.la* @$(INSTALL) -d .report_dir
@rm -rf .report_lib if build_so
@$(INSTALL) -d .report_lib if with_sharedlibs
@cp -P .libs/libopenjp3dvm.* .report_lib @find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
@rm -f .report_lib/libopenjp3dvm.lai @find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
if build_dll
if with_sharedlibs
@find .libs -type f -name "*\.dll" -exec cp -P {} .report_dir \;
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
if build_dylib
if with_sharedlibs
@find .libs -type f -name "*\.dylib" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type l -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
@cp -a .report_dir/* ../../bin
@echo "" > ../.report.txt @echo "" > ../.report.txt
@echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt
@echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt
@(cd .report_lib; \ @echo "Installing: ${prefix}/lib/libopenjp3dvm.la" >> ../.report.txt
l=`ls --file-type`; \ @(cd .report_dir; \
for f in $$l ; do \ for file in `ls *.dll 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$$f" >> ../../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../../.report.txt ; \
done) done ; \
@rm -rf .report_lib for file in `ls *.a 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../../.report.txt ; \
done ; \
for file in `ls *.so* 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../../.report.txt ; \
done ; \
for file in `ls *.dylib 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../../.report.txt ; \
done \
)
@rm -rf .report_dir
install-data-hook: install-data-hook:
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h) (cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)

39
jp3d/libjp3dvm/Makefile.in
View File

@ -618,21 +618,36 @@ dos2unix:
all-local: all-local:
@$(INSTALL) -d ../../bin @$(INSTALL) -d ../../bin
@cp -P .libs/libopenjp3dvm.* ../../bin @rm -rf .report_dir
@rm -f ../../bin/libopenjp3dvm.la* @$(INSTALL) -d .report_dir
@rm -rf .report_lib @build_so_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
@$(INSTALL) -d .report_lib @build_so_TRUE@@with_sharedlibs_TRUE@ @find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
@cp -P .libs/libopenjp3dvm.* .report_lib @build_so_TRUE@@with_sharedlibs_FALSE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@rm -f .report_lib/libopenjp3dvm.lai @build_dll_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.dll" -exec cp -P {} .report_dir \;
@build_dll_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@build_dll_TRUE@@with_sharedlibs_FALSE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@build_dylib_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.dylib" -exec cp -P {} .report_dir \;
@build_dylib_TRUE@@with_sharedlibs_FALSE@ @find .libs -type l -name "*\.a" -exec cp -P {} .report_dir \;
@cp -a .report_dir/* ../../bin
@echo "" > ../.report.txt @echo "" > ../.report.txt
@echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt
@echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt
@(cd .report_lib; \ @echo "Installing: ${prefix}/lib/libopenjp3dvm.la" >> ../.report.txt
l=`ls --file-type`; \ @(cd .report_dir; \
for f in $$l ; do \ for file in `ls *.dll 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$$f" >> ../../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../../.report.txt ; \
done) done ; \
@rm -rf .report_lib for file in `ls *.a 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../../.report.txt ; \
done ; \
for file in `ls *.so* 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../../.report.txt ; \
done ; \
for file in `ls *.dylib 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../../.report.txt ; \
done \
)
@rm -rf .report_dir
install-data-hook: install-data-hook:
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h) (cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)

63
jpwl/Makefile.am
View File

@ -88,22 +88,51 @@ JPWL_image_to_j2k_SOURCES = ../common/getopt.c ../codec/index.c \
REPBIN=$(bin_PROGRAMS) REPBIN=$(bin_PROGRAMS)
all-local: all-local:
$(INSTALL) -d ../bin @$(INSTALL) -d ../bin
$(INSTALL) $(bin_PROGRAMS) ../bin $(INSTALL) $(bin_PROGRAMS) ../bin
cp -P .libs/libopenjpeg_JPWL.* ../bin @rm -rf .report_dir
rm -f ../bin/libopenjpeg_JPWL.la* @$(INSTALL) -d .report_dir
@rm -rf .report_lib if build_so
@$(INSTALL) -d .report_lib if with_sharedlibs
@cp -P .libs/libopenjpeg_JPWL.* .report_lib @find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
@rm -f .report_lib/libopenjpeg_JPWL.lai @find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
echo "" > .report.txt else !with_sharedlibs
@(for f in ${REPBIN} ; do \ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \ endif !with_sharedlibs
endif
if build_dll
if with_sharedlibs
@find .libs -type f -name "*\.dll" -exec cp -P {} .report_dir \;
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
if build_dylib
if with_sharedlibs
@find .libs -type f -name "*\.dylib" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type l -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
@cp -a .report_dir/* ../bin
@echo "" > .report.txt
@(for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
done) done)
@(cd .report_lib; \ @echo "Installing: ${prefix}/lib/libopenjpeg_JPWL.la" >> .report.txt
l=`ls --file-type`; \ @(cd .report_dir; \
for f in $$l ; do \ for file in `ls *.dll 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
done) done ; \
@rm -rf .report_lib for file in `ls *.a 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.so* 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.dylib 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done \
)
@rm -rf .report_dir

47
jpwl/Makefile.in
View File

@ -973,24 +973,39 @@ dos2unix:
@$(DOS2UNIX) $(SRCS) $(INCLS) @$(DOS2UNIX) $(SRCS) $(INCLS)
all-local: all-local:
$(INSTALL) -d ../bin @$(INSTALL) -d ../bin
$(INSTALL) $(bin_PROGRAMS) ../bin $(INSTALL) $(bin_PROGRAMS) ../bin
cp -P .libs/libopenjpeg_JPWL.* ../bin @rm -rf .report_dir
rm -f ../bin/libopenjpeg_JPWL.la* @$(INSTALL) -d .report_dir
@rm -rf .report_lib @build_so_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
@$(INSTALL) -d .report_lib @build_so_TRUE@@with_sharedlibs_TRUE@ @find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
@cp -P .libs/libopenjpeg_JPWL.* .report_lib @build_so_TRUE@@with_sharedlibs_FALSE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@rm -f .report_lib/libopenjpeg_JPWL.lai @build_dll_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.dll" -exec cp -P {} .report_dir \;
echo "" > .report.txt @build_dll_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@(for f in ${REPBIN} ; do \ @build_dll_TRUE@@with_sharedlibs_FALSE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \ @build_dylib_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.dylib" -exec cp -P {} .report_dir \;
@build_dylib_TRUE@@with_sharedlibs_FALSE@ @find .libs -type l -name "*\.a" -exec cp -P {} .report_dir \;
@cp -a .report_dir/* ../bin
@echo "" > .report.txt
@(for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
done) done)
@(cd .report_lib; \ @echo "Installing: ${prefix}/lib/libopenjpeg_JPWL.la" >> .report.txt
l=`ls --file-type`; \ @(cd .report_dir; \
for f in $$l ; do \ for file in `ls *.dll 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
done) done ; \
@rm -rf .report_lib for file in `ls *.a 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.so* 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.dylib 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done \
)
@rm -rf .report_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.

54
libopenjpeg/Makefile.am
View File

@ -43,21 +43,51 @@ headerdir = openjpeg-$(MAJOR).$(MINOR)
all-local: all-local:
@$(INSTALL) -d ../bin @$(INSTALL) -d ../bin
@cp -P .libs/libopenjpeg.* ../bin/ @rm -rf .report_dir
@rm -f ../bin/libopenjpeg.la* @$(INSTALL) -d .report_dir
@rm -rf .report_lib if build_so
@$(INSTALL) -d .report_lib if with_sharedlibs
@cp -P .libs/libopenjpeg.* .report_lib @find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
@rm -f .report_lib/libopenjpeg.lai @find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
if build_dll
if with_sharedlibs
@find .libs -type f -name "*\.dll" -exec cp -P {} .report_dir \;
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
if build_dylib
if with_sharedlibs
@find .libs -type f -name "*\.dylib" -exec cp -P {} .report_dir \;
else !with_sharedlibs
@find .libs -type l -name "*\.a" -exec cp -P {} .report_dir \;
endif !with_sharedlibs
endif
@cp -a .report_dir/* ../bin
@echo "" > .report.txt @echo "" > .report.txt
@echo "Installing: ${prefix}/include/${headerdir}/" >> .report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> .report.txt
@echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> .report.txt @echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> .report.txt
@(cd .report_lib; \ @echo "Installing: ${prefix}/lib/libopenjpeg.la" >> .report.txt
l=`ls --file-type`; \ @(cd .report_dir; \
for f in $$l ; do \ for file in `ls *.dll 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
done) done ; \
@rm -rf .report_lib for file in `ls *.a 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.so* 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.dylib 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done \
)
@rm -rf .report_dir
install-data-hook: install-data-hook:
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg.h) (cd $(DESTDIR)${prefix}/include && rm -f openjpeg.h)

39
libopenjpeg/Makefile.in
View File

@ -616,21 +616,36 @@ dos2unix:
all-local: all-local:
@$(INSTALL) -d ../bin @$(INSTALL) -d ../bin
@cp -P .libs/libopenjpeg.* ../bin/ @rm -rf .report_dir
@rm -f ../bin/libopenjpeg.la* @$(INSTALL) -d .report_dir
@rm -rf .report_lib @build_so_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
@$(INSTALL) -d .report_lib @build_so_TRUE@@with_sharedlibs_TRUE@ @find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
@cp -P .libs/libopenjpeg.* .report_lib @build_so_TRUE@@with_sharedlibs_FALSE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@rm -f .report_lib/libopenjpeg.lai @build_dll_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.dll" -exec cp -P {} .report_dir \;
@build_dll_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@build_dll_TRUE@@with_sharedlibs_FALSE@ @find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
@build_dylib_TRUE@@with_sharedlibs_TRUE@ @find .libs -type f -name "*\.dylib" -exec cp -P {} .report_dir \;
@build_dylib_TRUE@@with_sharedlibs_FALSE@ @find .libs -type l -name "*\.a" -exec cp -P {} .report_dir \;
@cp -a .report_dir/* ../bin
@echo "" > .report.txt @echo "" > .report.txt
@echo "Installing: ${prefix}/include/${headerdir}/" >> .report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> .report.txt
@echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> .report.txt @echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> .report.txt
@(cd .report_lib; \ @echo "Installing: ${prefix}/lib/libopenjpeg.la" >> .report.txt
l=`ls --file-type`; \ @(cd .report_dir; \
for f in $$l ; do \ for file in `ls *.dll 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
done) done ; \
@rm -rf .report_lib for file in `ls *.a 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.so* 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done ; \
for file in `ls *.dylib 2> /dev/null` ; do \
echo "Installing: ${prefix}/lib/$${file}" >> ../.report.txt ; \
done \
)
@rm -rf .report_dir
install-data-hook: install-data-hook:
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg.h) (cd $(DESTDIR)${prefix}/include && rm -f openjpeg.h)

4
mj2/Makefile.am
View File

@ -40,6 +40,6 @@ all-local:
$(INSTALL) -d ../bin $(INSTALL) -d ../bin
$(INSTALL) $(bin_PROGRAMS) ../bin $(INSTALL) $(bin_PROGRAMS) ../bin
@echo "" > .report.txt @echo "" > .report.txt
@(for f in ${REPBIN} ; do \ @(for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
done) done)

4
mj2/Makefile.in
View File

@ -620,8 +620,8 @@ all-local:
$(INSTALL) -d ../bin $(INSTALL) -d ../bin
$(INSTALL) $(bin_PROGRAMS) ../bin $(INSTALL) $(bin_PROGRAMS) ../bin
@echo "" > .report.txt @echo "" > .report.txt
@(for f in ${REPBIN} ; do \ @(for file in ${REPBIN} ; do \
echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \ echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
done) done)
# 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.