summaryrefslogtreecommitdiff
path: root/libopenjpeg/Makefile.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-10-01 04:55:00 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-10-01 04:55:00 +0000
commitfb82b6d7d9921074e5135f02040b38a302d6b611 (patch)
tree5c98f5d5c84ac662701d2b19b99b0a7ab895cbcb /libopenjpeg/Makefile.am
parent5d6ac5ea72a2d8acfd90ec104d735af06b9cb572 (diff)
[1.5] fix output when --disable-shared or --disable-static is
passed to configure. Minor fix for jpwl compilation.
Diffstat (limited to 'libopenjpeg/Makefile.am')
-rw-r--r--libopenjpeg/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 4c160e08..23a94b14 100644
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -78,8 +78,12 @@ install-data-hook:
openjpeg.h
@rm -rf $(top_builddir)/report.txt
@echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
+if BUILD_SHARED
@( $(call solist) ) >> $(top_builddir)/report.txt
+endif
+if BUILD_STATIC
@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
+endif
@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