summaryrefslogtreecommitdiff
path: root/codec
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2011-03-04 10:53:27 +0000
committerAntonin Descampe <antonin@gmail.com>2011-03-04 10:53:27 +0000
commit86edc0a40e991c77581a73bf74d60d3f500e6961 (patch)
treea0da3deeb53d376c2b0014d3668462c37a0e5314 /codec
parent89456eed517d6ecd768373f340e0e7f613e467ab (diff)
updated autotools files to improve build and install procedures (credit to Vincent Torri)
Diffstat (limited to 'codec')
-rw-r--r--codec/Makefile.am110
1 files changed, 65 insertions, 45 deletions
diff --git a/codec/Makefile.am b/codec/Makefile.am
index b4dd9b98..1e9a6284 100644
--- a/codec/Makefile.am
+++ b/codec/Makefile.am
@@ -1,52 +1,72 @@
-COMPILERFLAGS = -Wall
-
-if with_sharedlibs
-COMPILERFLAGS += -DOPJ_EXPORTS
-else
-COMPILERFLAGS += -DOPJ_STATIC
-endif
-
-USERLIBS = -lm
-INCLUDES = -I.. -I. -I../libopenjpeg -I../common
-
-if with_libtiff
-INCLUDES += @tiffincludes@
-USERLIBS += @tifflibs@
-endif
-
-if with_libpng
-INCLUDES += @pngincludes@
-USERLIBS += @pnglibs@
-endif
-
-if with_liblcms2
-INCLUDES += @lcms2includes@
-USERLIBS += @lcms2libs@
-endif
-
-if with_liblcms1
-INCLUDES += @lcms1includes@
-USERLIBS += @lcms1libs@
-endif
+MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = j2k_to_image image_to_j2k j2k_dump
-CFLAGS = $(COMPILERFLAGS) $(INCLUDES)
-LDADD = $(USERLIBS) ../libopenjpeg/libopenjpeg.la
-
-j2k_to_image_SOURCES = ../common/getopt.c index.c convert.c \
- ../common/color.c j2k_to_image.c
+j2k_to_image_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/codec \
+-I$(top_builddir)/codec \
+-I$(top_srcdir)/common \
+-I$(top_builddir)/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+@PNG_CFLAGS@ \
+@TIFF_CFLAGS@ \
+@LCMS1_CFLAGS@ \
+@LCMS2_CFLAGS@
+j2k_to_image_CFLAGS =
+j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ -lm
+j2k_to_image_SOURCES = \
+../common/color.c \
+../common/getopt.c \
+convert.c \
+index.c \
+j2k_to_image.c \
+../common/color.h
-image_to_j2k_SOURCES = ../common/getopt.c index.c convert.c image_to_j2k.c
+image_to_j2k_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/codec \
+-I$(top_builddir)/codec \
+-I$(top_srcdir)/common \
+-I$(top_builddir)/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+@PNG_CFLAGS@ \
+@TIFF_CFLAGS@
+image_to_j2k_CFLAGS =
+image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @TIFF_LIBS@ @PNG_LIBS@ -lm
+image_to_j2k_SOURCES = \
+../common/getopt.c \
+convert.c \
+index.c \
+image_to_j2k.c \
+convert.h \
+../common/format_defs.h \
+index.h
-j2k_dump_SOURCES = ../common/getopt.c index.c j2k_dump.c
+j2k_dump_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/codec \
+-I$(top_builddir)/codec \
+-I$(top_srcdir)/common \
+-I$(top_builddir)/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg
+j2k_dump_CFLAGS =
+j2k_dump_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
+j2k_dump_SOURCES = \
+../common/getopt.c \
+index.c \
+j2k_dump.c \
+../common/getopt.h \
+index.h
-REPBIN=$(bin_PROGRAMS)
+EXTRA_DIST = \
+CMakeLists.txt \
+windirent.h
-all-local:
- $(INSTALL) -d ../bin
- $(INSTALL) $(bin_PROGRAMS) ../bin
- @echo "" > .report.txt
- @for file in ${REPBIN} ; do \
- echo "Installing: ${prefix}/bin/$${file}" >> .report.txt ; \
- done
+install-data-hook:
+ @echo -e " (B)\t\t$(bindir)/j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
+ @echo -e " (B)\t\t$(bindir)/image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
+ @echo -e " (B)\t\t$(bindir)/j2k_dump$(EXEEXT)" >> $(top_builddir)/report.txt