rename jp2_write_colr_v2 to opj_jp2_write_colr

[openjpeg.git] / libopenjpeg / Makefile.am

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index aef6ba6f23aedde47c6a1d6130ff1d25affaa9a6..2fb79f9fce07562a5fdb55d82a5e080aabc4c927 100644 (file)
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS += jpwl
 endif
 
 includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
-includes_HEADERS = openjpeg.h
+includes_HEADERS = openjpeg.h opj_stdint.h $(top_builddir)/opj_config.h
 
 lib_LTLIBRARIES = libopenjpeg.la
 
@@ -75,16 +75,16 @@ EXTRA_DIST = \
 CMakeLists.txt
 
 install-data-hook:
-       cd $(DESTDIR)$(includedir) && \
-         rm -f openjpeg.h && \
-         $(LN_S) openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h \
-                 openjpeg.h
+       cd $(DESTDIR)$(includedir) && rm -f 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
 
 uninstall-hook:
        rm -f $(DESTDIR)$(includedir)/openjpeg.h