diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2011-10-10 06:51:08 +0000 |
|---|---|---|
| committer | Vincent Torri <vincent.torri@gmail.com> | 2011-10-10 06:51:08 +0000 |
| commit | 81b9e78565e48d5b66e8a5c2b1698ef47ccf5c9e (patch) | |
| tree | 0a7c1006bafa9e58263c534e897e49ab563bfd61 /libopenjpeg | |
| parent | cee450517293a56e61e37835a9eaf67c64568bec (diff) | |
[trunk] add libopenjpeg-jpwl.pc.in. fix output when --disable-shared or --disable-static is passed to configure. Minor clean up of configure.ac.
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/Makefile.am | 4 | ||||
| -rw-r--r-- | libopenjpeg/jpwl/Makefile.am | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am index aef6ba6f..0c551e0c 100644 --- a/libopenjpeg/Makefile.am +++ b/libopenjpeg/Makefile.am @@ -81,8 +81,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 701348b6..26ab4eba 100644 --- a/libopenjpeg/jpwl/Makefile.am +++ b/libopenjpeg/jpwl/Makefile.am @@ -51,8 +51,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) |