changed report code in Makefile.am

17 files changed, 325 insertions, 101 deletions

diff --git a/CHANGES b/CHANGES
index ad729e83..4a6bba15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+January 7, 2011
+! [szukw000] changed report code in Makefile.am
+
 January 3, 2011
 - [antonin] removed badly written tests from CTest in 'codec/CMakeLists.txt'
 
diff --git a/Makefile.am b/Makefile.am
index 9d5aa9b6..5805b7fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@ SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc
 
 clean-local:
 	@rm -rf bin
-	@l='$(SUBDIRS)'; for f in $$l ; do \
-	rm -f $$f/.report.txt ; \
+	@list='$(SUBDIRS)'; for dir in $${list} ; do \
+	rm -f $${dir}/.report.txt ; \
 	done
 
 distclean-local: clean-local
@@ -13,8 +13,8 @@ pkgconf_dir = /usr/lib/pkgconfig
 
 install-data-hook:
 	@echo ""
-	@l='$(SUBDIRS)'; for f in $$l ; do \
-	cat $$f/.report.txt ; \
+	@list='$(SUBDIRS)'; for dir in $${list} ; do \
+	cat $${dir}/.report.txt ; \
 	done
 	@echo ""
 	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
diff --git a/Makefile.in b/Makefile.in
index c051ac2d..15700928 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -749,16 +749,16 @@ uninstall-am:
 
 clean-local:
 	@rm -rf bin
-	@l='$(SUBDIRS)'; for f in $$l ; do \
-	rm -f $$f/.report.txt ; \
+	@list='$(SUBDIRS)'; for dir in $${list} ; do \
+	rm -f $${dir}/.report.txt ; \
 	done
 
 distclean-local: clean-local
 
 install-data-hook:
 	@echo ""
-	@l='$(SUBDIRS)'; for f in $$l ; do \
-	cat $$f/.report.txt ; \
+	@list='$(SUBDIRS)'; for dir in $${list} ; do \
+	cat $${dir}/.report.txt ; \
 	done
 	@echo ""
 	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
diff --git a/codec/Makefile.am b/codec/Makefile.am
index b75b4b4b..b4dd9b98 100644
--- a/codec/Makefile.am
+++ b/codec/Makefile.am
@@ -47,6 +47,6 @@ all-local:
 	$(INSTALL) -d ../bin
 	$(INSTALL) $(bin_PROGRAMS) ../bin
 	@echo "" > .report.txt
-	@for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \
+	@for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
 	done
diff --git a/codec/Makefile.in b/codec/Makefile.in
index 8eaf2459..3db9918c 100644
--- a/codec/Makefile.in
+++ b/codec/Makefile.in
@@ -613,8 +613,8 @@ all-local:
 	$(INSTALL) -d ../bin
 	$(INSTALL) $(bin_PROGRAMS) ../bin
 	@echo "" > .report.txt
-	@for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \
+	@for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/configure b/configure
index a8c3962e..ec6a3de5 100755
--- a/configure
+++ b/configure
@@ -612,6 +612,12 @@ with_doxygen_FALSE
 with_doxygen_TRUE
 with_doxygen
 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_TRUE
 jpwl_dir
@@ -16080,6 +16086,51 @@ else
 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
 # -------------------------------
@@ -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.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 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
   as_fn_error "conditional \"with_doxygen\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 777ac531..366183d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -408,6 +408,30 @@ test "$enable_shared" = "no" && with_sharedlibs="no")
 AC_MSG_RESULT($with_sharedlibs)
 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
 # -------------------------------
diff --git a/jp3d/codec/Makefile.am b/jp3d/codec/Makefile.am
index 819b91a3..3f82c1b4 100644
--- a/jp3d/codec/Makefile.am
+++ b/jp3d/codec/Makefile.am
@@ -22,6 +22,6 @@ REPBIN=$(bin_PROGRAMS)
 all-local:
 	$(INSTALL) -d ../../bin
 	$(INSTALL) $(bin_PROGRAMS) ../../bin
-	@(for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> ../.report.txt ; \
+	@(for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
 	done)
diff --git a/jp3d/codec/Makefile.in b/jp3d/codec/Makefile.in
index dd4b2f87..47ccb994 100644
--- a/jp3d/codec/Makefile.in
+++ b/jp3d/codec/Makefile.in
@@ -555,8 +555,8 @@ uninstall-am: uninstall-binPROGRAMS
 all-local:
 	$(INSTALL) -d ../../bin
 	$(INSTALL) $(bin_PROGRAMS) ../../bin
-	@(for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> ../.report.txt ; \
+	@(for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
 	done)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/jp3d/libjp3dvm/Makefile.am b/jp3d/libjp3dvm/Makefile.am
index 434fa977..4b5c3b9c 100644
--- a/jp3d/libjp3dvm/Makefile.am
+++ b/jp3d/libjp3dvm/Makefile.am
@@ -44,21 +44,51 @@ headerdir = openjpeg3d-$(MAJOR).$(MINOR)
 
 all-local:
 	@$(INSTALL) -d ../../bin
-	@cp -P .libs/libopenjp3dvm.* ../../bin
-	@rm -f ../../bin/libopenjp3dvm.la*
-	@rm -rf .report_lib
-	@$(INSTALL) -d .report_lib
-	@cp -P .libs/libopenjp3dvm.* .report_lib
-	@rm -f .report_lib/libopenjp3dvm.lai
+	@rm -rf .report_dir
+	@$(INSTALL) -d .report_dir
+if build_so
+if with_sharedlibs
+	@find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
+	@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 "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt
 	@echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt
-	@(cd .report_lib; \
-	l=`ls --file-type`; \
-	for f in $$l ; do \
-	echo "Installing: ${prefix}/lib/$$f" >> ../../.report.txt ; \
-	done)
-	@rm -rf .report_lib
+	@echo "Installing: ${prefix}/lib/libopenjp3dvm.la" >> ../.report.txt
+	@(cd .report_dir; \
+	for file in `ls *.dll 2> /dev/null` ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../../.report.txt ; \
+	done ; \
+	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:
 	(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
diff --git a/jp3d/libjp3dvm/Makefile.in b/jp3d/libjp3dvm/Makefile.in
index 6a6c74ad..1bfd63a6 100644
--- a/jp3d/libjp3dvm/Makefile.in
+++ b/jp3d/libjp3dvm/Makefile.in
@@ -618,21 +618,36 @@ dos2unix:
 
 all-local:
 	@$(INSTALL) -d ../../bin
-	@cp -P .libs/libopenjp3dvm.* ../../bin
-	@rm -f ../../bin/libopenjp3dvm.la*
-	@rm -rf .report_lib
-	@$(INSTALL) -d .report_lib
-	@cp -P .libs/libopenjp3dvm.* .report_lib
-	@rm -f .report_lib/libopenjp3dvm.lai
+	@rm -rf .report_dir
+	@$(INSTALL) -d .report_dir
+@build_so_TRUE@@with_sharedlibs_TRUE@	@find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
+@build_so_TRUE@@with_sharedlibs_TRUE@	@find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
+@build_so_TRUE@@with_sharedlibs_FALSE@	@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
+@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 "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt
 	@echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt
-	@(cd .report_lib; \
-	l=`ls --file-type`; \
-	for f in $$l ; do \
-	echo "Installing: ${prefix}/lib/$$f" >> ../../.report.txt ; \
-	done)
-	@rm -rf .report_lib
+	@echo "Installing: ${prefix}/lib/libopenjp3dvm.la" >> ../.report.txt
+	@(cd .report_dir; \
+	for file in `ls *.dll 2> /dev/null` ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../../.report.txt ; \
+	done ; \
+	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:
 	(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am
index fd1c953d..9bc7dc41 100644
--- a/jpwl/Makefile.am
+++ b/jpwl/Makefile.am
@@ -88,22 +88,51 @@ JPWL_image_to_j2k_SOURCES = ../common/getopt.c ../codec/index.c \
 REPBIN=$(bin_PROGRAMS)
 
 all-local:
-	$(INSTALL) -d ../bin
+	@$(INSTALL) -d ../bin
 	$(INSTALL) $(bin_PROGRAMS) ../bin
-	cp -P .libs/libopenjpeg_JPWL.* ../bin
-	rm -f ../bin/libopenjpeg_JPWL.la*
-	@rm -rf .report_lib
-	@$(INSTALL) -d .report_lib
-	@cp -P .libs/libopenjpeg_JPWL.* .report_lib
-	@rm -f .report_lib/libopenjpeg_JPWL.lai
-	echo "" > .report.txt
-	@(for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \
-	done)
-	@(cd .report_lib; \
-	l=`ls --file-type`; \
-	for f in $$l ; do \
-	echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \
+	@rm -rf .report_dir
+	@$(INSTALL) -d .report_dir
+if build_so
+if with_sharedlibs
+	@find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
+	@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
+	@(for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
 	done)
-	@rm -rf .report_lib
-
+	@echo "Installing: ${prefix}/lib/libopenjpeg_JPWL.la" >> .report.txt
+	@(cd .report_dir; \
+	for file in `ls *.dll 2> /dev/null` ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
+	done ; \
+	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
diff --git a/jpwl/Makefile.in b/jpwl/Makefile.in
index 2ca0b4de..cd137cb7 100644
--- a/jpwl/Makefile.in
+++ b/jpwl/Makefile.in
@@ -973,24 +973,39 @@ dos2unix:
 	@$(DOS2UNIX) $(SRCS) $(INCLS)
 
 all-local:
-	$(INSTALL) -d ../bin
+	@$(INSTALL) -d ../bin
 	$(INSTALL) $(bin_PROGRAMS) ../bin
-	cp -P .libs/libopenjpeg_JPWL.* ../bin
-	rm -f ../bin/libopenjpeg_JPWL.la*
-	@rm -rf .report_lib
-	@$(INSTALL) -d .report_lib
-	@cp -P .libs/libopenjpeg_JPWL.* .report_lib
-	@rm -f .report_lib/libopenjpeg_JPWL.lai
-	echo "" > .report.txt
-	@(for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \
+	@rm -rf .report_dir
+	@$(INSTALL) -d .report_dir
+@build_so_TRUE@@with_sharedlibs_TRUE@	@find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
+@build_so_TRUE@@with_sharedlibs_TRUE@	@find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
+@build_so_TRUE@@with_sharedlibs_FALSE@	@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
+@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
+	@(for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
 	done)
-	@(cd .report_lib; \
-	l=`ls --file-type`; \
-	for f in $$l ; do \
-	echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \
-	done)
-	@rm -rf .report_lib
+	@echo "Installing: ${prefix}/lib/libopenjpeg_JPWL.la" >> .report.txt
+	@(cd .report_dir; \
+	for file in `ls *.dll 2> /dev/null` ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
+	done ; \
+	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.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 30a2b815..b2d2490b 100644
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -43,21 +43,51 @@ headerdir = openjpeg-$(MAJOR).$(MINOR)
 
 all-local:
 	@$(INSTALL) -d ../bin
-	@cp -P .libs/libopenjpeg.* ../bin/
-	@rm -f ../bin/libopenjpeg.la*
-	@rm -rf .report_lib
-	@$(INSTALL) -d .report_lib
-	@cp -P .libs/libopenjpeg.* .report_lib
-	@rm -f .report_lib/libopenjpeg.lai
+	@rm -rf .report_dir
+	@$(INSTALL) -d .report_dir
+if build_so
+if with_sharedlibs
+	@find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
+	@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 "Installing: ${prefix}/include/${headerdir}/" >> .report.txt
 	@echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> .report.txt
-	@(cd .report_lib; \
-	l=`ls --file-type`; \
-	for f in $$l ; do \
-	echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \
-	done)
-	@rm -rf .report_lib
+	@echo "Installing: ${prefix}/lib/libopenjpeg.la" >> .report.txt
+	@(cd .report_dir; \
+	for file in `ls *.dll 2> /dev/null` ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
+	done ; \
+	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:
 	(cd $(DESTDIR)${prefix}/include && rm -f openjpeg.h)
diff --git a/libopenjpeg/Makefile.in b/libopenjpeg/Makefile.in
index 295747ce..dda7e58c 100644
--- a/libopenjpeg/Makefile.in
+++ b/libopenjpeg/Makefile.in
@@ -616,21 +616,36 @@ dos2unix:
 
 all-local:
 	@$(INSTALL) -d ../bin
-	@cp -P .libs/libopenjpeg.* ../bin/
-	@rm -f ../bin/libopenjpeg.la*
-	@rm -rf .report_lib
-	@$(INSTALL) -d .report_lib
-	@cp -P .libs/libopenjpeg.* .report_lib
-	@rm -f .report_lib/libopenjpeg.lai
+	@rm -rf .report_dir
+	@$(INSTALL) -d .report_dir
+@build_so_TRUE@@with_sharedlibs_TRUE@	@find .libs -type f -name "*\.so*" -exec cp -P {} .report_dir \;
+@build_so_TRUE@@with_sharedlibs_TRUE@	@find .libs -type l -name "*\.so*" -exec cp -P {} .report_dir \;
+@build_so_TRUE@@with_sharedlibs_FALSE@	@find .libs -type f -name "*\.a" -exec cp -P {} .report_dir \;
+@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 "Installing: ${prefix}/include/${headerdir}/" >> .report.txt
 	@echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> .report.txt
-	@(cd .report_lib; \
-	l=`ls --file-type`; \
-	for f in $$l ; do \
-	echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \
-	done)
-	@rm -rf .report_lib
+	@echo "Installing: ${prefix}/lib/libopenjpeg.la" >> .report.txt
+	@(cd .report_dir; \
+	for file in `ls *.dll 2> /dev/null` ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
+	done ; \
+	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:
 	(cd $(DESTDIR)${prefix}/include && rm -f openjpeg.h)
diff --git a/mj2/Makefile.am b/mj2/Makefile.am
index 006803be..4f972cf4 100644
--- a/mj2/Makefile.am
+++ b/mj2/Makefile.am
@@ -40,6 +40,6 @@ all-local:
 	$(INSTALL) -d ../bin
 	$(INSTALL) $(bin_PROGRAMS) ../bin
 	@echo "" > .report.txt
-	@(for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \
+	@(for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
 	done)
diff --git a/mj2/Makefile.in b/mj2/Makefile.in
index 97884867..6fd49ece 100644
--- a/mj2/Makefile.in
+++ b/mj2/Makefile.in
@@ -620,8 +620,8 @@ all-local:
 	$(INSTALL) -d ../bin
 	$(INSTALL) $(bin_PROGRAMS) ../bin
 	@echo "" > .report.txt
-	@(for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \
+	@(for file in ${REPBIN} ; do \
+	echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
 	done)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.