diff --git a/codec/Makefile.am b/codec/Makefile.am
index 819b91a3..3f82c1b4 100644
--- a/codec/Makefile.am
+++ b/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/codec/Makefile.in b/codec/Makefile.in
index dd4b2f87..47ccb994 100644
--- a/codec/Makefile.in
+++ b/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/libjp3dvm/Makefile.am b/libjp3dvm/Makefile.am
index 434fa977..4b5c3b9c 100644
--- a/libjp3dvm/Makefile.am
+++ b/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/libjp3dvm/Makefile.in b/libjp3dvm/Makefile.in
index 6a6c74ad..1bfd63a6 100644
--- a/libjp3dvm/Makefile.in
+++ b/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)