X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=jpwl%2FMakefile.am;h=3bbce01150d1562fa49dd6a46f8913f01d840c1e;hb=87e4c72ee4be8eb4899cfab25359440a9ecacafa;hp=e379bde0b949d6fb9348a593d1e091dc01cf76fc;hpb=f4b08bacb03457eae440ed88f70ac1598f2cee42;p=openjpeg.git

diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am
index e379bde0..3bbce011 100644
--- a/jpwl/Makefile.am
+++ b/jpwl/Makefile.am
@@ -1,98 +1,116 @@
-MAJOR = @MAJOR_NR@
-MINOR = @MINOR_NR@
-BUILD = @BUILD_NR@
-CURRENT=`expr $(MAJOR) + $(MINOR)`
+MAINTAINERCLEANFILES = Makefile.in
 
 lib_LTLIBRARIES = libopenjpeg_JPWL.la
 
-libopenjpeg_JPWL_la_LDFLAGS = -no-undefined \
-  -version-info $(CURRENT):$(BUILD):$(MINOR)
+OPJ_SRC = \
+../libopenjpeg/bio.c \
+../libopenjpeg/cio.c \
+../libopenjpeg/dwt.c \
+../libopenjpeg/event.c \
+../libopenjpeg/image.c \
+../libopenjpeg/j2k.c \
+../libopenjpeg/j2k_lib.c \
+../libopenjpeg/jp2.c \
+../libopenjpeg/jpt.c \
+../libopenjpeg/mct.c \
+../libopenjpeg/mqc.c \
+../libopenjpeg/openjpeg.c \
+../libopenjpeg/pi.c \
+../libopenjpeg/raw.c \
+../libopenjpeg/t1.c \
+../libopenjpeg/t2.c \
+../libopenjpeg/tcd.c \
+../libopenjpeg/tgt.c
+
+libopenjpeg_JPWL_la_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-I$(top_srcdir)/jpwl \
+-I$(top_builddir)/jpwl \
+-DUSE_JPWL
+libopenjpeg_JPWL_la_CFLAGS =
+libopenjpeg_JPWL_la_LIBADD = -lm
+libopenjpeg_JPWL_la_LDFLAGS = -no-undefined -version-info @lt_version@
+libopenjpeg_JPWL_la_SOURCES = \
+$(OPJ_SRC) \
+crc.c \
+jpwl.c \
+jpwl_lib.c \
+rs.c \
+jpwl.h \
+crc.h \
+rs.h
 
-JPWL_SRCS = crc.c jpwl.c jpwl_lib.c rs.c
-JPWL_INCLS = jpwl.h crc.h rs.h
-
-SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c \
-  ../libopenjpeg/event.c ../libopenjpeg/image.c ../libopenjpeg/j2k.c \
-  ../libopenjpeg/j2k_lib.c ../libopenjpeg/jp2.c ../libopenjpeg/jpt.c \
-  ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c \
-  ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c \
-  ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c \
-  ../libopenjpeg/opj_convert.c $(JPWL_SRCS)
-
-INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \
-  ../libopenjpeg/event.h ../libopenjpeg/fix.h ../libopenjpeg/image.h \
-  ../libopenjpeg/int.h ../libopenjpeg/j2k.h ../libopenjpeg/j2k_lib.h \
-  ../libopenjpeg/jp2.h ../libopenjpeg/jpt.h ../libopenjpeg/mct.h \
-  ../libopenjpeg/mqc.h ../libopenjpeg/openjpeg.h ../libopenjpeg/pi.h \
-  ../libopenjpeg/raw.h ../libopenjpeg/t1.h ../libopenjpeg/t2.h \
-  ../libopenjpeg/tcd.h ../libopenjpeg/tgt.h ../libopenjpeg/opj_malloc.h \
-  ../libopenjpeg/opj_convert.h ../libopenjpeg/opj_includes.h \
-  $(JPWL_INCLS)
-
-libopenjpeg_JPWL_la_SOURCES = $(SRCS) $(INCLS)
-libopenjpeg_JPWL_la_LIBADD = @LDLIBS@
-
-# Converts cr/lf to just lf
-DOS2UNIX = dos2unix
-
-dos2unix:
-	@$(DOS2UNIX) $(SRCS) $(INCLS)
-
-COMPILERFLAGS = -Wall -ffast-math -std=c99 -static
-
-USERLIBS = -lm
-INCLUDES = -I.. -I. -I../libopenjpeg
-
-if with_libtiff
-INCLUDES += @tiffincludes@
-USERLIBS += @tifflibs@
-endif
-
-if with_libpng
-INCLUDES += @pngincludes@
-USERLIBS += @pnglibs@
-endif
+bin_PROGRAMS = JPWL_j2k_to_image JPWL_image_to_j2k
 
-if with_liblcms2
-INCLUDES += @lcms2includes@
-USERLIBS += @lcms2libs@
+JPWL_j2k_to_image_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/common \
+-I$(top_builddir)/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-I$(top_srcdir)/jpwl \
+-I$(top_builddir)/jpwl \
+-DUSE_JPWL \
+@TIFF_CFLAGS@ \
+@PNG_CFLAGS@ \
+@LCMS1_CFLAGS@ \
+@LCMS2_CFLAGS@
+JPWL_j2k_to_image_CFLAGS =
+JPWL_j2k_to_image_LDADD = $(top_builddir)/jpwl/libopenjpeg_JPWL.la  @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@
+JPWL_j2k_to_image_SOURCES = \
+$(top_builddir)/common/color.c \
+$(top_builddir)/common/getopt.c \
+$(top_builddir)/codec/index.c \
+$(top_builddir)/codec/convert.c \
+$(top_builddir)/codec/j2k_to_image.c
+
+JPWL_image_to_j2k_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/common \
+-I$(top_builddir)/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-I$(top_srcdir)/jpwl \
+-I$(top_builddir)/jpwl \
+-DUSE_JPWL \
+@TIFF_CFLAGS@ \
+@PNG_CFLAGS@
+JPWL_image_to_j2k_CFLAGS =
+JPWL_image_to_j2k_LDADD = $(top_builddir)/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@
+
+JPWL_image_to_j2k_SOURCES = \
+$(top_builddir)/common/getopt.c \
+$(top_builddir)/codec/index.c \
+$(top_builddir)/codec/convert.c \
+$(top_builddir)/codec/image_to_j2k.c
+
+EXTRA_DIST = \
+CMakeLists.txt
+
+install-data-hook:
+	@echo -e " (B)\t$(bindir)/JPWL_j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (B)\t$(bindir)/JPWL_image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt
+	@( $(call solist) ) >> $(top_builddir)/report.txt
+	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
+
+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 HAVE_WIN32
+SO_PREFIX = (DLL)
+dll       = $(call get_tok,dlname)
+else
+if HAVE_DARWIN
+SO_PREFIX = (DY)
+dll       =
+else
+SO_PREFIX = (SO)
+dll       =
 endif
-
-if with_liblcms1
-INCLUDES += @lcms1includes@
-USERLIBS += @lcms1libs@
 endif
-
-bin_PROGRAMS = JPWL_j2k_to_image JPWL_image_to_j2k
-
-CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL
-LDADD = ./libopenjpeg_JPWL.la $(USERLIBS)
-
-JPWL_j2k_to_image_SOURCES = ../codec/compat/getopt.c ../codec/index.c \
-	../codec/convert.c ../codec/j2k_to_image.c
-
-JPWL_image_to_j2k_SOURCES = ../codec/compat/getopt.c ../codec/index.c \
-	../codec/convert.c ../codec/image_to_j2k.c 
-
-REPBIN=$(bin_PROGRAMS)
-
-all-local:
-	$(INSTALL) -d ../bin
-	$(INSTALL) $(bin_PROGRAMS) ../bin
-	cp -d .libs/libopenjpeg_JPWL.* ../bin
-	rm -f ../bin/libopenjpeg_JPWL.la*
-	@rm -rf .report_lib
-	@$(INSTALL) -d .report_lib
-	@cp -d .libs/libopenjpeg_JPWL.* .report_lib
-	@rm -f .report_lib/libopenjpeg_JPWL.lai
-	echo "" > .report.txt
-	@(for f in ${REPBIN} ; do \
-	echo "Installing: ${prefix}/bin/$$f" >> .report.txt ; \
-	done)
-	@(cd .report_lib; \
-	l=`ls --file-type`; \
-	for f in $$l ; do \
-	echo "Installing: ${prefix}/lib/$$f" >> ../.report.txt ; \
-	done)
-	@rm -rf .report_lib
-