From a3df1f5c5ed930c019dd7d6b383bb45fb7f1953b Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Fri, 4 Mar 2011 11:03:33 +0000 Subject: [PATCH] small fix related to the formatting of the install report displayed at the end of install procedure --- codec/Makefile.am | 6 +++--- jp3d/codec/Makefile.am | 4 ++-- jp3d/libjp3dvm/Makefile.am | 4 ++-- jpwl/Makefile.am | 6 +++--- libopenjpeg/Makefile.am | 4 ++-- mj2/Makefile.am | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/codec/Makefile.am b/codec/Makefile.am index 1e9a6284..14e5160d 100644 --- a/codec/Makefile.am +++ b/codec/Makefile.am @@ -67,6 +67,6 @@ CMakeLists.txt \ windirent.h install-data-hook: - @echo -e " (B)\t\t$(bindir)/j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t\t$(bindir)/image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t\t$(bindir)/j2k_dump$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/j2k_dump$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/jp3d/codec/Makefile.am b/jp3d/codec/Makefile.am index 52811acf..bf6ff1e5 100644 --- a/jp3d/codec/Makefile.am +++ b/jp3d/codec/Makefile.am @@ -19,5 +19,5 @@ CMakeLists.txt \ windirent.h install-data-hook: - @echo -e " (B)\t\t$(bindir)/jp3d_to_volume$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t\t$(bindir)/volume_to_jp3d$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/jp3d_to_volume$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/volume_to_jp3d$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/jp3d/libjp3dvm/Makefile.am b/jp3d/libjp3dvm/Makefile.am index d0bdba06..2e533e6d 100644 --- a/jp3d/libjp3dvm/Makefile.am +++ b/jp3d/libjp3dvm/Makefile.am @@ -61,8 +61,8 @@ install-data-hook: openjpeg3d.h @echo -e " (LA)\t$(libdir)/libopenjp3dvm.la" >> $(top_builddir)/report.txt @( $(call solist) ) >> $(top_builddir)/report.txt - @echo -e " (A)\t\t$(base)/$(a)" >> $(top_builddir)/report.txt - @echo -e " (H)\t\t$(includedir)/openjpeg3d-$(MAJOR_NR).$(MINOR_NR)/openjpeg3d.h" >> $(top_builddir)/report.txt + @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt + @echo -e " (H)\t$(includedir)/openjpeg3d-$(MAJOR_NR).$(MINOR_NR)/openjpeg3d.h" >> $(top_builddir)/report.txt @echo -e " (LN)\t$(includedir)/openjpeg3d.h" >> $(top_builddir)/report.txt uninstall-hook: diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am index 954ee375..3bbce011 100644 --- a/jpwl/Makefile.am +++ b/jpwl/Makefile.am @@ -90,11 +90,11 @@ EXTRA_DIST = \ CMakeLists.txt install-data-hook: - @echo -e " (B)\t\t$(bindir)/JPWL_j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t\t$(bindir)/JPWL_image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/JPWL_j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/JPWL_image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt @( $(call solist) ) >> $(top_builddir)/report.txt - @echo -e " (A)\t\t$(base)/$(a)" >> $(top_builddir)/report.txt + @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt solist = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;) get_tok = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2) diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am index 614fc073..458f957a 100644 --- a/libopenjpeg/Makefile.am +++ b/libopenjpeg/Makefile.am @@ -68,8 +68,8 @@ install-data-hook: @rm -rf $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt @( $(call solist) ) >> $(top_builddir)/report.txt - @echo -e " (A)\t\t$(base)/$(a)" >> $(top_builddir)/report.txt - @echo -e " (H)\t\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt + @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt + @echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt @echo -e " (LN)\t$(includedir)/openjpeg.h" >> $(top_builddir)/report.txt uninstall-hook: diff --git a/mj2/Makefile.am b/mj2/Makefile.am index 6738ed17..c96bd97f 100644 --- a/mj2/Makefile.am +++ b/mj2/Makefile.am @@ -107,7 +107,7 @@ EXTRA_DIST = \ CMakeLists.txt install-data-hook: - @echo -e " (B)\t\t$(bindir)/frames_to_mj2$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t\t$(bindir)/mj2_to_frames$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t\t$(bindir)/extract_j2k_from_mj2$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t\t$(bindir)/wrap_j2k_in_mj2$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/frames_to_mj2$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/mj2_to_frames$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/extract_j2k_from_mj2$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/wrap_j2k_in_mj2$(EXEEXT)" >> $(top_builddir)/report.txt