[1.5] remove extra trailing semicolon

[openjpeg.git] / libopenjpeg / Makefile.am

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index c0dd1639a87e077ea11b4f351ccc562628adcfb3..9ceaa17d08bf5b3831461b973e38ee8e8d325eb5 100644 (file)
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -14,11 +14,9 @@ lib_LTLIBRARIES = libopenjpeg.la
 libopenjpeg_la_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@LCMS1_CFLAGS@ \
-@LCMS2_CFLAGS@
+-I$(top_builddir)/libopenjpeg
 libopenjpeg_la_CFLAGS =
-libopenjpeg_la_LIBADD = @LCMS1_LIBS@ @LCMS2_LIBS@
+libopenjpeg_la_LIBADD = -lm
 libopenjpeg_la_LDFLAGS = -no-undefined -version-info @lt_version@
 
 libopenjpeg_la_SOURCES = \
@@ -41,12 +39,18 @@ t1_generate_luts.c \
 t2.c \
 tcd.c \
 tgt.c \
+cidx_manager.c \
+phix_manager.c \
+ppix_manager.c \
+thix_manager.c \
+tpix_manager.c \
 bio.h \
 cio.h \
 dwt.h \
 event.h \
 fix.h \
 image.h \
+indexbox_manager.h \
 int.h \
 j2k.h \
 j2k_lib.h \
@@ -62,22 +66,23 @@ t1.h \
 t1_luts.h \
 t2.h \
 tcd.h \
-tgt.h
+tgt.h \
+cidx_manager.h
 
 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