diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2011-10-01 04:55:00 +0000 |
|---|---|---|
| committer | Vincent Torri <vincent.torri@gmail.com> | 2011-10-01 04:55:00 +0000 |
| commit | fb82b6d7d9921074e5135f02040b38a302d6b611 (patch) | |
| tree | 5c98f5d5c84ac662701d2b19b99b0a7ab895cbcb /libopenjpeg | |
| parent | 5d6ac5ea72a2d8acfd90ec104d735af06b9cb572 (diff) | |
[1.5] fix output when --disable-shared or --disable-static is
passed to configure. Minor fix for jpwl compilation.
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/Makefile.am | 4 | ||||
| -rw-r--r-- | libopenjpeg/jpwl/Makefile.am | 6 |
2 files changed, 9 insertions, 1 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 diff --git a/libopenjpeg/jpwl/Makefile.am b/libopenjpeg/jpwl/Makefile.am index 8677a399..f1eda310 100644 --- a/libopenjpeg/jpwl/Makefile.am +++ b/libopenjpeg/jpwl/Makefile.am @@ -26,7 +26,7 @@ OPJ_SRC = \ ../phix_manager.c \ ../ppix_manager.c \ ../thix_manager.c \ -../tpix_manager.c +../tpix_manager.c libopenjpeg_JPWL_la_CPPFLAGS = \ -I. \ @@ -50,8 +50,12 @@ rs.h install-data-hook: @echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.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 solist = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;) get_tok = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2) |