changed report code in Makefile.am

[openjpeg.git] / libopenjpeg / Makefile.am

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 30a2b815b13e54868940dcf801c15a36170e6cd7..b2d2490b4aa2017199045b27f13ab2434f366be9 100644 (file)
--- 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)