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 2c38002242
commit 431f559f49
4 changed files with 73 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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
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
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
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)