[1.5] remove extra trailing semicolon

[openjpeg.git] / libopenjpeg / Makefile.am

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 30a2b815b13e54868940dcf801c15a36170e6cd7..9ceaa17d08bf5b3831461b973e38ee8e8d325eb5 100644 (file)
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -1,68 +1,107 @@
-MAJOR = @MAJOR_NR@
-MINOR = @MINOR_NR@
-BUILD = @BUILD_NR@
-CURRENT=`expr $(MAJOR) + $(MINOR)`
+MAINTAINERCLEANFILES = Makefile.in
 
-lib_LTLIBRARIES = libopenjpeg.la
+SUBDIRS = .
 
-INCLUDES = -I.. -I.
+if WANT_JPWL
+SUBDIRS += jpwl
+endif
 
-libopenjpeg_la_LDFLAGS = -no-undefined \
-  -version-info $(CURRENT):$(BUILD):$(MINOR)
+includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
+includes_HEADERS = openjpeg.h
 
-SRCS = bio.c cio.c dwt.c event.c image.c j2k.c j2k_lib.c jp2.c jpt.c \
- mct.c mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c
+lib_LTLIBRARIES = libopenjpeg.la
 
-INCLS = bio.h cio.h dwt.h event.h fix.h image.h int.h j2k.h j2k_lib.h \
- jp2.h jpt.h mct.h mqc.h pi.h raw.h t1.h t2.h tcd.h tgt.h opj_malloc.h \
- opj_includes.h
+libopenjpeg_la_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg
+libopenjpeg_la_CFLAGS =
+libopenjpeg_la_LIBADD = -lm
+libopenjpeg_la_LDFLAGS = -no-undefined -version-info @lt_version@
 
-libopenjpeg_la_SOURCES = $(SRCS) $(INCLS)
+libopenjpeg_la_SOURCES = \
+bio.c \
+cio.c \
+dwt.c \
+event.c \
+image.c \
+j2k.c \
+j2k_lib.c \
+jp2.c \
+jpt.c \
+mct.c \
+mqc.c \
+openjpeg.c \
+pi.c \
+raw.c \
+t1.c \
+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 \
+jp2.h \
+jpt.h \
+mct.h \
+mqc.h \
+opj_includes.h \
+opj_malloc.h \
+pi.h \
+raw.h \
+t1.h \
+t1_luts.h \
+t2.h \
+tcd.h \
+tgt.h \
+cidx_manager.h
 
-includedir = ${prefix}/include/openjpeg-$(MAJOR).$(MINOR)
-include_HEADERS = openjpeg.h
+EXTRA_DIST = \
+CMakeLists.txt
 
-# Converts cr/lf to just lf
-DOS2UNIX = dos2unix
+install-data-hook:
+       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
 
-dos2unix:
-       @$(DOS2UNIX) $(SRCS) $(INCLS)
+uninstall-hook:
+       rm -f $(DESTDIR)$(includedir)/openjpeg.h
 
-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
+solist    = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
+get_tok   = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)
+base      = $(call get_tok,libdir)
+so        = $(call get_tok,library_names)
+a         = $(call get_tok,old_library)
 
-if with_sharedlibs
-COMPILERFLAGS += -DOPJ_EXPORTS
+if HAVE_WIN32
+SO_PREFIX = (DLL)
+dll       = $(call get_tok,dlname)
+else
+if HAVE_DARWIN
+SO_PREFIX = (DY)
+dll       =
 else
-COMPILERFLAGS += -DOPJ_STATIC
-libopenjpeg_la_LDFLAGS += -static
+SO_PREFIX = (SO)
+dll       =
+endif
 endif
-
-CFLAGS = $(COMPILERFLAGS) $(INCLUDES)
-
-headerdir = openjpeg-$(MAJOR).$(MINOR)
-
-all-local:
-       @$(INSTALL) -d ../bin
-       @cp -P .libs/libopenjpeg.* ../bin/
-       @rm -f ../bin/libopenjpeg.la*
-       @rm -rf .report_lib
-       @$(INSTALL) -d .report_lib
-       @cp -P .libs/libopenjpeg.* .report_lib
-       @rm -f .report_lib/libopenjpeg.lai
-       @echo "" > .report.txt
-       @echo "Installing: ${prefix}/include/${headerdir}/" >> .report.txt
-       @echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> .report.txt
-       @(cd .report_lib; \
-       l=`ls --file-type`; \
-       for f in $$l ; do \
-       echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \
-       done)
-       @rm -rf .report_lib
-
-install-data-hook:
-       (cd $(DESTDIR)${prefix}/include && rm -f openjpeg.h)
-       (cd $(DESTDIR)${prefix}/include && \
-       $(LN_S) ${headerdir}/openjpeg.h openjpeg.h)
-       
-uninstall-hook:
-       (cd $(DESTDIR)${prefix}/include && rm -rf openjpeg.h ${headerdir})