Adapted Makefile.am/Makefile.nix to build choice: shared xor static
This commit is contained in:
parent
1dd92890d7
commit
398b3f08b0
4
CHANGES
4
CHANGES
|
@ -5,6 +5,10 @@ What's New for OpenJPEG
|
|||
! : changed
|
||||
+ : added
|
||||
|
||||
December 14, 2010
|
||||
! [szukw000] adapted Makefile.am/Makefile.nix to build
|
||||
choice: shared xor static
|
||||
|
||||
December 11, 2010
|
||||
* [antonin] fixed flags when building jp3d with MinGW
|
||||
|
||||
|
|
|
@ -218,7 +218,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
|
29
Makefile.nix
29
Makefile.nix
|
@ -35,10 +35,11 @@ MODULES = $(SRCS:.c=.o)
|
|||
CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
|
||||
|
||||
LIBNAME = lib$(TARGET)
|
||||
STATICLIB = $(LIBNAME).a
|
||||
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
SHAREDLIB = $(LIBNAME).so.$(MAJOR).$(MINOR).$(BUILD)
|
||||
else
|
||||
STATICLIB = $(LIBNAME).a
|
||||
endif
|
||||
|
||||
default: all
|
||||
|
@ -58,35 +59,37 @@ dos2unix:
|
|||
|
||||
OpenJPEG: $(STATICLIB) $(SHAREDLIB)
|
||||
install -d bin
|
||||
install -m 644 $(STATICLIB) bin
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
install -m 755 $(SHAREDLIB) bin
|
||||
(cd bin && ln -sf $(SHAREDLIB) $(LIBNAME).so.$(MAJOR).$(MINOR))
|
||||
(cd bin && ln -sf $(LIBNAME).so.$(MAJOR).$(MINOR) $(LIBNAME).so)
|
||||
(cd bin && ln -sf $(SHAREDLIB) $(LIBNAME).so)
|
||||
else
|
||||
install -m 644 $(STATICLIB) bin
|
||||
endif
|
||||
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
||||
$(STATICLIB): $(MODULES)
|
||||
rm -f $(STATICLIB)
|
||||
$(AR) r $@ $(MODULES)
|
||||
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
$(SHAREDLIB): $(MODULES)
|
||||
$(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
|
||||
else
|
||||
$(STATICLIB): $(MODULES)
|
||||
rm -f $(STATICLIB)
|
||||
$(AR) r $@ $(MODULES)
|
||||
endif
|
||||
|
||||
install: OpenJPEG
|
||||
install -d $(DESTDIR)$(INSTALL_LIBDIR)
|
||||
install -m 644 -o root -g root $(STATICLIB) $(DESTDIR)$(INSTALL_LIBDIR)
|
||||
(cd $(DESTDIR)$(INSTALL_LIBDIR) && ranlib $(STATICLIB) )
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
install -m 755 -o root -g root $(SHAREDLIB) $(DESTDIR)$(INSTALL_LIBDIR)
|
||||
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \
|
||||
ln -sf $(SHAREDLIB) $(LIBNAME).so.$(MAJOR).$(MINOR) )
|
||||
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \
|
||||
ln -sf $(LIBNAME).so.$(MAJOR).$(MINOR) $(LIBNAME).so )
|
||||
ln -sf $(SHAREDLIB) $(LIBNAME).so )
|
||||
else
|
||||
install -m 644 -o root -g root $(STATICLIB) $(DESTDIR)$(INSTALL_LIBDIR)
|
||||
(cd $(DESTDIR)$(INSTALL_LIBDIR) && ranlib $(STATICLIB) )
|
||||
endif
|
||||
install -d $(DESTDIR)$(INSTALL_INCLUDE)
|
||||
install -m 644 -o root -g root libopenjpeg/openjpeg.h \
|
||||
|
@ -157,10 +160,11 @@ doc-clean:
|
|||
make -C doc -f Makefile.nix clean
|
||||
|
||||
uninstall:
|
||||
rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \
|
||||
rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB) )
|
||||
else
|
||||
rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)
|
||||
endif
|
||||
$(LDCONFIG)
|
||||
rm -f $(DESTDIR)$(prefix)/include/openjpeg.h
|
||||
|
@ -174,3 +178,6 @@ endif
|
|||
ifeq ($(WITH_JP3D),yes)
|
||||
make -C jp3d -f Makefile.nix uninstall
|
||||
endif
|
||||
|
||||
distclean: clean
|
||||
rm -rf bin
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +1,9 @@
|
|||
COMPILERFLAGS = -Wall
|
||||
|
||||
if with_staticlibs
|
||||
COMPILERFLAGS += -static
|
||||
if with_sharedlibs
|
||||
COMPILERFLAGS += -DOPJ_EXPORTS
|
||||
else
|
||||
COMPILERFLAGS += -DOPJ_STATIC
|
||||
endif
|
||||
|
||||
USERLIBS = -lm
|
||||
|
|
|
@ -35,15 +35,16 @@ POST_UNINSTALL = :
|
|||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@with_staticlibs_TRUE@am__append_1 = -static
|
||||
@with_libtiff_TRUE@am__append_2 = @tiffincludes@
|
||||
@with_libtiff_TRUE@am__append_3 = @tifflibs@
|
||||
@with_libpng_TRUE@am__append_4 = @pngincludes@
|
||||
@with_libpng_TRUE@am__append_5 = @pnglibs@
|
||||
@with_liblcms2_TRUE@am__append_6 = @lcms2includes@
|
||||
@with_liblcms2_TRUE@am__append_7 = @lcms2libs@
|
||||
@with_liblcms1_TRUE@am__append_8 = @lcms1includes@
|
||||
@with_liblcms1_TRUE@am__append_9 = @lcms1libs@
|
||||
@with_sharedlibs_TRUE@am__append_1 = -DOPJ_EXPORTS
|
||||
@with_sharedlibs_FALSE@am__append_2 = -DOPJ_STATIC
|
||||
@with_libtiff_TRUE@am__append_3 = @tiffincludes@
|
||||
@with_libtiff_TRUE@am__append_4 = @tifflibs@
|
||||
@with_libpng_TRUE@am__append_5 = @pngincludes@
|
||||
@with_libpng_TRUE@am__append_6 = @pnglibs@
|
||||
@with_liblcms2_TRUE@am__append_7 = @lcms2includes@
|
||||
@with_liblcms2_TRUE@am__append_8 = @lcms2libs@
|
||||
@with_liblcms1_TRUE@am__append_9 = @lcms1includes@
|
||||
@with_liblcms1_TRUE@am__append_10 = @lcms1libs@
|
||||
bin_PROGRAMS = j2k_to_image$(EXEEXT) image_to_j2k$(EXEEXT) \
|
||||
j2k_dump$(EXEEXT)
|
||||
subdir = codec
|
||||
|
@ -215,7 +216,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
@ -240,11 +240,11 @@ top_build_prefix = @top_build_prefix@
|
|||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
with_doxygen = @with_doxygen@
|
||||
COMPILERFLAGS = -Wall $(am__append_1)
|
||||
USERLIBS = -lm $(am__append_3) $(am__append_5) $(am__append_7) \
|
||||
$(am__append_9)
|
||||
INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_2) \
|
||||
$(am__append_4) $(am__append_6) $(am__append_8)
|
||||
COMPILERFLAGS = -Wall $(am__append_1) $(am__append_2)
|
||||
USERLIBS = -lm $(am__append_4) $(am__append_6) $(am__append_8) \
|
||||
$(am__append_10)
|
||||
INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_3) \
|
||||
$(am__append_5) $(am__append_7) $(am__append_9)
|
||||
LDADD = $(USERLIBS) ../libopenjpeg/libopenjpeg.la
|
||||
j2k_to_image_SOURCES = ../common/getopt.c index.c convert.c \
|
||||
../common/color.c j2k_to_image.c
|
||||
|
|
22
configure.ac
22
configure.ac
|
@ -129,7 +129,7 @@ if test "x$with_libpng" = xyes ; then
|
|||
savedLIBS="$LIBS"
|
||||
LIBS="$pnglibs $LIB_Z $LIB_MATH"
|
||||
#
|
||||
AC_CHECK_LIB(png,png_read_png,,pnglibs="",)
|
||||
AC_CHECK_LIB(png,png_create_read_struct,,pnglibs="",)
|
||||
#
|
||||
LIBS="$savedLIBS"
|
||||
if test -n "$pnglibs" ; then
|
||||
|
@ -299,7 +299,7 @@ if test "x$with_liblcms2" = xyes ; then
|
|||
fi
|
||||
#
|
||||
AC_MSG_RESULT(lcms2 is usable:$with_liblcms2)
|
||||
AM_CONDITIONAL([with_liblcms2], [test x$with_liblmcs2 = xyes])
|
||||
AM_CONDITIONAL([with_liblcms2], [test x$with_liblcms2 = xyes])
|
||||
AC_SUBST(lcms2includes)
|
||||
AC_SUBST(lcms2libs)
|
||||
AC_MSG_RESULT(lcms2libs:$lcms2libs)
|
||||
|
@ -406,24 +406,7 @@ AC_ARG_ENABLE(shared,
|
|||
test "$enable_shared" = "no" && with_sharedlibs="no")
|
||||
#
|
||||
AC_MSG_RESULT($with_sharedlibs)
|
||||
#
|
||||
# -------------------------------
|
||||
# Test for creating STATIC LIBS
|
||||
# -------------------------------
|
||||
if test "$with_sharedlibs" = "yes" ; then
|
||||
with_staticlibs="no"
|
||||
else
|
||||
with_staticlibs="yes"
|
||||
AC_MSG_CHECKING(whether to build static libraries)
|
||||
AC_ARG_ENABLE(static,
|
||||
[ --enable-static[=[yes|no]] Build static libs [ [default=no] ]],
|
||||
test "$enable_static" = "no" && with_staticlibs="no")
|
||||
#
|
||||
AC_MSG_RESULT($with_staticlibs)
|
||||
#
|
||||
fi
|
||||
AM_CONDITIONAL([with_sharedlibs], [test x$with_sharedlibs = xyes])
|
||||
AM_CONDITIONAL([with_staticlibs], [test x$with_staticlibs = xyes])
|
||||
#
|
||||
# -------------------------------
|
||||
# Test for creating JP3D
|
||||
|
@ -472,5 +455,4 @@ echo "lcms1 version : $have_lcms1_version"
|
|||
echo "--enable-jpwl : $with_libjpwl"
|
||||
echo "--enable-jp3d : $with_jp3d"
|
||||
echo "--enable-shared : $with_sharedlibs"
|
||||
echo "--enable-static : $with_staticlibs"
|
||||
echo "----------------------------------------------"
|
||||
|
|
|
@ -163,7 +163,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
|
|
@ -203,7 +203,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
|
|
@ -4,8 +4,10 @@ USERLIBS =
|
|||
INCLUDES = -I. -I../libjp3dvm
|
||||
CFLAGS = -Wall $(INCLUDES)
|
||||
|
||||
if with_staticlibs
|
||||
CFLAGS += -static
|
||||
if with_sharedlibs
|
||||
CFLAGS += -DOPJ_EXPORTS
|
||||
else
|
||||
CFLAGS += -DOPJ_STATIC
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = jp3d_to_volume volume_to_jp3d
|
||||
|
|
|
@ -37,7 +37,8 @@ POST_UNINSTALL = :
|
|||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@with_staticlibs_TRUE@am__append_1 = -static
|
||||
@with_sharedlibs_TRUE@am__append_1 = -DOPJ_EXPORTS
|
||||
@with_sharedlibs_FALSE@am__append_2 = -DOPJ_STATIC
|
||||
bin_PROGRAMS = jp3d_to_volume$(EXEEXT) volume_to_jp3d$(EXEEXT)
|
||||
subdir = jp3d/codec
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
|
@ -93,7 +94,7 @@ AWK = @AWK@
|
|||
BUILD_NR = @BUILD_NR@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = -Wall $(INCLUDES) $(am__append_1)
|
||||
CFLAGS = -Wall $(INCLUDES) $(am__append_1) $(am__append_2)
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
@ -198,7 +199,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
|
|
@ -27,10 +27,16 @@ DOS2UNIX = dos2unix
|
|||
dos2unix:
|
||||
@$(DOS2UNIX) $(SRCS) $(INCLS)
|
||||
|
||||
|
||||
INCLUDES = -I../.. -I.. -I.
|
||||
INCLUDES = -I../.. -I.
|
||||
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
|
||||
|
||||
if with_sharedlibs
|
||||
COMPILERFLAGS += -DOPJ_EXPORTS
|
||||
else
|
||||
COMPILERFLAGS += -DOPJ_STATIC
|
||||
libopenjp3dvm_la_LDFLAGS += -static
|
||||
endif
|
||||
|
||||
CFLAGS = $(COMPILERFLAGS) $(INCLUDES)
|
||||
#CFLAGS += -DJP3D_VERSION="\"$(MAJOR).$(MINOR).$(BUILD)\""
|
||||
|
||||
|
@ -56,7 +62,6 @@ all-local:
|
|||
|
||||
install-data-hook:
|
||||
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
|
||||
(cd ${prefix}/include/${headerdir} && mv openjpeg3d.h openjpeg3d.h)
|
||||
(cd $(DESTDIR)${prefix}/include && \
|
||||
$(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)
|
||||
|
||||
|
|
|
@ -36,6 +36,9 @@ POST_UNINSTALL = :
|
|||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@with_sharedlibs_TRUE@am__append_1 = -DOPJ_EXPORTS
|
||||
@with_sharedlibs_FALSE@am__append_2 = -DOPJ_STATIC
|
||||
@with_sharedlibs_FALSE@am__append_3 = -static
|
||||
subdir = jp3d/libjp3dvm
|
||||
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in
|
||||
|
@ -215,7 +218,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
@ -248,9 +250,8 @@ MINOR = @JP3D_MINOR_NR@
|
|||
BUILD = @JP3D_BUILD_NR@
|
||||
CURRENT = `expr $(MAJOR) + $(MINOR)`
|
||||
lib_LTLIBRARIES = libopenjp3dvm.la
|
||||
libopenjp3dvm_la_LDFLAGS = -no-undefined \
|
||||
-version-info $(CURRENT):$(BUILD):$(MINOR)
|
||||
|
||||
libopenjp3dvm_la_LDFLAGS = -no-undefined -version-info \
|
||||
$(CURRENT):$(BUILD):$(MINOR) $(am__append_3)
|
||||
SRCS = bio.c cio.c dwt.c event.c jp3d.c jp3d_lib.c volume.c mct.c mqc.c \
|
||||
openjpeg.c pi.c raw.c t1.c t1_3d.c t2.c tcd.c tgt.c
|
||||
|
||||
|
@ -262,8 +263,9 @@ include_HEADERS = openjpeg3d.h
|
|||
|
||||
# Converts cr/lf to just lf
|
||||
DOS2UNIX = dos2unix
|
||||
INCLUDES = -I../.. -I.. -I.
|
||||
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
|
||||
INCLUDES = -I../.. -I.
|
||||
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 $(am__append_1) \
|
||||
$(am__append_2)
|
||||
#CFLAGS += -DJP3D_VERSION="\"$(MAJOR).$(MINOR).$(BUILD)\""
|
||||
headerdir = openjpeg3d-$(MAJOR).$(MINOR)
|
||||
all: all-am
|
||||
|
@ -634,7 +636,6 @@ all-local:
|
|||
|
||||
install-data-hook:
|
||||
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
|
||||
(cd ${prefix}/include/${headerdir} && mv openjpeg3d.h openjpeg3d.h)
|
||||
(cd $(DESTDIR)${prefix}/include && \
|
||||
$(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)
|
||||
|
||||
|
|
|
@ -69,9 +69,11 @@ bin_PROGRAMS = JPWL_j2k_to_image JPWL_image_to_j2k
|
|||
JPWL_j2k_to_image_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL
|
||||
JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL
|
||||
|
||||
if with_staticlibs
|
||||
JPWL_j2k_to_image_CFLAGS += -static
|
||||
JPWL_image_to_j2k_CFLAGS += -static
|
||||
if with_sharedlibs
|
||||
COMPILERFLAGS += -DOPJ_EXPORTS
|
||||
else
|
||||
COMPILERFLAGS += -DOPJ_STATIC
|
||||
libopenjpeg_JPWL_la_LDFLAGS += -static
|
||||
endif
|
||||
|
||||
CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL
|
||||
|
|
|
@ -45,8 +45,9 @@ target_triplet = @target@
|
|||
@with_liblcms1_TRUE@am__append_7 = @lcms1includes@
|
||||
@with_liblcms1_TRUE@am__append_8 = @lcms1libs@
|
||||
bin_PROGRAMS = JPWL_j2k_to_image$(EXEEXT) JPWL_image_to_j2k$(EXEEXT)
|
||||
@with_staticlibs_TRUE@am__append_9 = -static
|
||||
@with_staticlibs_TRUE@am__append_10 = -static
|
||||
@with_sharedlibs_TRUE@am__append_9 = -DOPJ_EXPORTS
|
||||
@with_sharedlibs_FALSE@am__append_10 = -DOPJ_STATIC
|
||||
@with_sharedlibs_FALSE@am__append_11 = -static
|
||||
subdir = jpwl
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
|
@ -257,7 +258,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
@ -287,9 +287,8 @@ MINOR = @MINOR_NR@
|
|||
BUILD = @BUILD_NR@
|
||||
CURRENT = `expr $(MAJOR) + $(MINOR)`
|
||||
lib_LTLIBRARIES = libopenjpeg_JPWL.la
|
||||
libopenjpeg_JPWL_la_LDFLAGS = -no-undefined \
|
||||
-version-info $(CURRENT):$(BUILD):$(MINOR)
|
||||
|
||||
libopenjpeg_JPWL_la_LDFLAGS = -no-undefined -version-info \
|
||||
$(CURRENT):$(BUILD):$(MINOR) $(am__append_11)
|
||||
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 \
|
||||
|
@ -314,15 +313,14 @@ libopenjpeg_JPWL_la_SOURCES = $(SRCS) $(INCLS)
|
|||
|
||||
# Converts cr/lf to just lf
|
||||
DOS2UNIX = dos2unix
|
||||
COMPILERFLAGS = -Wall -ffast-math -std=c99
|
||||
COMPILERFLAGS = -Wall -ffast-math -std=c99 $(am__append_9) \
|
||||
$(am__append_10)
|
||||
USERLIBS = $(am__append_2) $(am__append_4) $(am__append_6) \
|
||||
$(am__append_8) -lm
|
||||
INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_1) \
|
||||
$(am__append_3) $(am__append_5) $(am__append_7)
|
||||
JPWL_j2k_to_image_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL \
|
||||
$(am__append_9)
|
||||
JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL \
|
||||
$(am__append_10)
|
||||
JPWL_j2k_to_image_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL
|
||||
JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL
|
||||
LDADD = ./libopenjpeg_JPWL.la $(USERLIBS)
|
||||
JPWL_j2k_to_image_SOURCES = ../common/getopt.c ../codec/index.c \
|
||||
../codec/convert.c ../common/color.c ../codec/j2k_to_image.c
|
||||
|
|
|
@ -30,6 +30,13 @@ dos2unix:
|
|||
|
||||
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
|
||||
|
||||
if with_sharedlibs
|
||||
COMPILERFLAGS += -DOPJ_EXPORTS
|
||||
else
|
||||
COMPILERFLAGS += -DOPJ_STATIC
|
||||
libopenjpeg_la_LDFLAGS += -static
|
||||
endif
|
||||
|
||||
CFLAGS = $(COMPILERFLAGS) $(INCLUDES)
|
||||
|
||||
headerdir = openjpeg-$(MAJOR).$(MINOR)
|
||||
|
|
|
@ -36,6 +36,9 @@ POST_UNINSTALL = :
|
|||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@with_sharedlibs_TRUE@am__append_1 = -DOPJ_EXPORTS
|
||||
@with_sharedlibs_FALSE@am__append_2 = -DOPJ_STATIC
|
||||
@with_sharedlibs_FALSE@am__append_3 = -static
|
||||
subdir = libopenjpeg
|
||||
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in
|
||||
|
@ -215,7 +218,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
@ -246,9 +248,8 @@ BUILD = @BUILD_NR@
|
|||
CURRENT = `expr $(MAJOR) + $(MINOR)`
|
||||
lib_LTLIBRARIES = libopenjpeg.la
|
||||
INCLUDES = -I.. -I.
|
||||
libopenjpeg_la_LDFLAGS = -no-undefined \
|
||||
-version-info $(CURRENT):$(BUILD):$(MINOR)
|
||||
|
||||
libopenjpeg_la_LDFLAGS = -no-undefined -version-info \
|
||||
$(CURRENT):$(BUILD):$(MINOR) $(am__append_3)
|
||||
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
|
||||
|
||||
|
@ -261,7 +262,8 @@ include_HEADERS = openjpeg.h
|
|||
|
||||
# Converts cr/lf to just lf
|
||||
DOS2UNIX = dos2unix
|
||||
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
|
||||
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 $(am__append_1) \
|
||||
$(am__append_2)
|
||||
headerdir = openjpeg-$(MAJOR).$(MINOR)
|
||||
all: all-am
|
||||
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
COMPILERFLAGS = -Wall
|
||||
|
||||
if with_staticlibs
|
||||
COMPILERFLAGS += -static
|
||||
if with_sharedlibs
|
||||
COMPILERFLAGS += -DOPJ_EXPORTS
|
||||
else
|
||||
COMPILERFLAGS += -DOPJ_STATIC
|
||||
endif
|
||||
|
||||
USERLIBS =
|
||||
|
|
|
@ -35,11 +35,12 @@ POST_UNINSTALL = :
|
|||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@with_staticlibs_TRUE@am__append_1 = -static
|
||||
@with_liblcms2_TRUE@am__append_2 = @lcms2includes@
|
||||
@with_liblcms2_TRUE@am__append_3 = @lcms2libs@
|
||||
@with_liblcms1_TRUE@am__append_4 = @lcms1includes@
|
||||
@with_liblcms1_TRUE@am__append_5 = @lcms1libs@
|
||||
@with_sharedlibs_TRUE@am__append_1 = -DOPJ_EXPORTS
|
||||
@with_sharedlibs_FALSE@am__append_2 = -DOPJ_STATIC
|
||||
@with_liblcms2_TRUE@am__append_3 = @lcms2includes@
|
||||
@with_liblcms2_TRUE@am__append_4 = @lcms2libs@
|
||||
@with_liblcms1_TRUE@am__append_5 = @lcms1includes@
|
||||
@with_liblcms1_TRUE@am__append_6 = @lcms1libs@
|
||||
bin_PROGRAMS = frames_to_mj2$(EXEEXT) mj2_to_frames$(EXEEXT) \
|
||||
extract_j2k_from_mj2$(EXEEXT) wrap_j2k_in_mj2$(EXEEXT)
|
||||
subdir = mj2
|
||||
|
@ -216,7 +217,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
@ -241,10 +241,10 @@ top_build_prefix = @top_build_prefix@
|
|||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
with_doxygen = @with_doxygen@
|
||||
COMPILERFLAGS = -Wall $(am__append_1)
|
||||
USERLIBS = $(am__append_3) $(am__append_5)
|
||||
INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_2) \
|
||||
$(am__append_4)
|
||||
COMPILERFLAGS = -Wall $(am__append_1) $(am__append_2)
|
||||
USERLIBS = $(am__append_4) $(am__append_6)
|
||||
INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_3) \
|
||||
$(am__append_5)
|
||||
LDADD = ../libopenjpeg/libopenjpeg.la $(USERLIBS)
|
||||
frames_to_mj2_SOURCES = ../common/getopt.c mj2_convert.c mj2.c \
|
||||
frames_to_mj2.c
|
||||
|
|
Loading…
Reference in New Issue