diff --git a/CHANGES b/CHANGES index 767f6f71..8712b116 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,41 @@ What's New for OpenJPEG ! : changed + : added +October 17, 2010 +- [szukw000] doc/man/ : directory removed +! [szukw000] + configure.ac : 'enable_shared' YES by default + doc/Makefile.am : + 'all-local' and 'install-data-hook' added + 'with_doxygen' conditional added + Makefile.am : 'doc' directory no longer substituted in SUBDIRS + + to link binaries statically: '-static' added to: + codec/Makefile.am + mj2/Makefile.am + jpwl/Makefile.am + jp3d/codec/Makefile.am + + mj2/Makefile.am : 'with_libjpwl' removed + mj2/Makefile.nix : 'with_libjpwl' removed + + config.nix : 'WITH_JPWL', 'WITH_JP3D' added + doc/Makefile.nix : 'clean', 'install', 'uninstall' added + Makefile.nix : 'WITH_JPWL', 'WITH_JP3D' added + + INSTALL : topic 3) changed regarding the changes in 'config.nix' + +October 13, 2010 +! [szukw000] + configure.ac + bootstrap.sh + + 'with_libjpwl' removed from: + libopenjpeg/Makefile.am + codec/Makefile.am + codec/Makefile.nix + Makefile.nix + October 10, 2010 * [antonin] Patch from winfried diff --git a/INSTALL b/INSTALL index b14fb395..a82faa9e 100644 --- a/INSTALL +++ b/INSTALL @@ -62,12 +62,15 @@ Main available cmake flags: 3) Manually using Makefile.nix: - Manually edit the config.nix file - Manually create an opj_config.h file from opj_config.h.in.user -- Then : (remove the unwanted targets) - make -f Makefile.nix all jpwl-all jp3d-all doc-all - make -f Makefile.nix clean jpwl-clean jp3d-clean doc-clean - make -f Makefile.nix install jpwl-install jp3d-install - make -f Makefile.nix uninstall jpwl-uninstall jp3d-uninstall - + and edit this opj_config.h +- Then : (if 'WITH_JPWL' and/or 'WITH_JP3D' are defined in config.nix) + make -f Makefile.nix all + make -f Makefile.nix install + make -f Makefile.nix clean + make -f Makefile.nix uninstall +- If neither 'WITH_JPWL' nor 'WITH_JP3D' is defined in config.nix + and you want to clean/compile/install/uninstall JPWL/JP3D: + call the respective target in the respective directory. MACOSX ------ diff --git a/Makefile.am b/Makefile.am index 1220a8c5..20af0c66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ #OpenJPEG top source directory -SUBDIRS = @jpwl_dir@ libopenjpeg codec mj2 @jp3d_dir@ @doxy_dir@ +SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc clean-local: @rm -rf bin diff --git a/Makefile.in b/Makefile.in index 825a26ac..b992bdfb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -198,7 +198,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -247,7 +246,7 @@ top_srcdir = @top_srcdir@ with_doxygen = @with_doxygen@ #OpenJPEG top source directory -SUBDIRS = @jpwl_dir@ libopenjpeg codec mj2 @jp3d_dir@ @doxy_dir@ +SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc all: opj_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/Makefile.nix b/Makefile.nix index 7141cded..2d867076 100644 --- a/Makefile.nix +++ b/Makefile.nix @@ -1,4 +1,4 @@ -#top Makefile +#top Makefile.nix include config.nix TARGET = openjpeg @@ -59,12 +59,12 @@ default: all all: OpenJPEG make -C codec -f Makefile.nix all make -C mj2 -f Makefile.nix all - -jpwl-all: +ifeq ($(WITH_JPWL),yes) make -C jpwl -f Makefile.nix all - -jp3d-all: +endif +ifeq ($(WITH_JP3D),yes) make -C jp3d -f Makefile.nix all +endif dos2unix: @$(DOS2UNIX) $(SRCS) $(INCLS) @@ -101,7 +101,6 @@ ifeq ($(ENABLE_SHARED),yes) (cd $(DESTDIR)$(INSTALL_LIBDIR) && \ ln -sf $(LIBNAME).so.$(MAJOR).$(MINOR) $(LIBNAME).so ) endif - ldconfig install -d $(DESTDIR)$(INSTALL_INCLUDE) install -m 644 -o root -g root libopenjpeg/openjpeg.h \ $(DESTDIR)$(INSTALL_INCLUDE) @@ -109,19 +108,49 @@ endif ln -sf $(headerdir)/openjpeg.h openjpeg.h) make -C codec -f Makefile.nix install make -C mj2 -f Makefile.nix install +ifeq ($(WITH_JPWL),yes) + make -C jpwl -f Makefile.nix install +endif +ifeq ($(WITH_JP3D),yes) + make -C jp3d -f Makefile.nix install +endif + ldconfig + make -C doc -f Makefile.nix install -jpwl-install: jpwl +ifeq ($(WITH_JPWL),yes) +jpwl-all: + make -C jpwl -f Makefile.nix all + +jpwl-install: jpwl-all make -C jpwl -f Makefile.nix install ldconfig -jp3d-install: jp3d +jpwl-clean: + make -C jpwl -f Makefile.nix clean + +jpwl-uninstall: + make -C jpwl -f Makefile.nix uninstall +endif + +ifeq ($(WITH_JP3D),yes) +jp3d-all: + make -C jp3d -f Makefile.nix all + +jp3d-install: jp3d-all make -C jp3d -f Makefile.nix install ldconfig +jp3d-clean: + make -C jp3d -f Makefile.nix clean + +jp3d-uninstall: + make -C jp3d -f Makefile.nix uninstall +endif + doc-all: make -C doc -f Makefile.nix all -doc-install: docs +doc-install: doc-all make -C doc -f Makefile.nix install clean: @@ -129,12 +158,13 @@ clean: rm -f core u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) make -C codec -f Makefile.nix clean make -C mj2 -f Makefile.nix clean - -jpwl-clean: + make -C doc -f Makefile.nix clean +ifeq ($(WITH_JPWL),yes) make -C jpwl -f Makefile.nix clean - -jp3d-clean: +endif +ifeq ($(WITH_JP3D),yes) make -C jp3d -f Makefile.nix clean +endif doc-clean: make -C doc -f Makefile.nix clean @@ -150,9 +180,10 @@ endif rm -rf $(DESTDIR)$(INSTALL_INCLUDE) make -C codec -f Makefile.nix uninstall make -C mj2 -f Makefile.nix uninstall - -jpwl-uninstall: + make -C doc -f Makefile.nix uninstall +ifeq ($(WITH_JPWL),yes) make -C jpwl -f Makefile.nix uninstall - -jp3d-uninstall: +endif +ifeq ($(WITH_JP3D),yes) make -C jp3d -f Makefile.nix uninstall +endif diff --git a/codec/Makefile.am b/codec/Makefile.am index 1a3f42bc..43d54506 100644 --- a/codec/Makefile.am +++ b/codec/Makefile.am @@ -1,4 +1,4 @@ -COMPILERFLAGS = -Wall +COMPILERFLAGS = -Wall -static USERLIBS = -lm INCLUDES = -I.. -I. -I../libopenjpeg diff --git a/codec/Makefile.in b/codec/Makefile.in index 4db9e420..6d39386d 100644 --- a/codec/Makefile.in +++ b/codec/Makefile.in @@ -194,7 +194,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -241,7 +240,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ with_doxygen = @with_doxygen@ -COMPILERFLAGS = -Wall +COMPILERFLAGS = -Wall -static USERLIBS = -lm $(am__append_2) $(am__append_4) $(am__append_6) \ $(am__append_8) INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3) \ diff --git a/config.nix b/config.nix index bebe939d..8748dc33 100644 --- a/config.nix +++ b/config.nix @@ -6,21 +6,28 @@ JP3D_MAJOR = 1 JP3D_MINOR = 3 JP3D_BUILD = 0 -prefix=/usr/local +prefix=/usr/local/OPJ646 CC = gcc #Set this to yes if you want to compile/install shared libs. -ENABLE_SHARED = no +ENABLE_SHARED = yes # #Set to yes if you BOTH have the library AND the header #Set to no if a file is missing or you hate it. #Either lcms or lcms2 : not both -#SHOULD BE IN SYNC WITH opj_config.h +#==== HAVE YOU CREATED opj_config.h FROM opj_config.h.in.user ? ==== +#==== SHOULD BE IN SYNC WITH opj_config.h ==== WITH_LCMS1 = no -WITH_LCMS2 = no -WITH_PNG = no -WITH_TIFF = no - +WITH_LCMS2 = yes +WITH_PNG = yes +WITH_TIFF = yes +# +# Set to yes if you want compile/install +# jpwl libraries/binaries +# jp3d libraries/binaries +WITH_JPWL = yes +WITH_JP3D = yes +# #Set to yes if you have doxygen installed #Set to no if doxygen is missing. HAS_DOXYGEN = yes diff --git a/configure b/configure index 3bcc1438..43cff88e 100755 --- a/configure +++ b/configure @@ -747,7 +747,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -doxy_dir +with_doxygen_FALSE +with_doxygen_TRUE with_doxygen LDLIBS jp3d_dir @@ -1570,7 +1571,7 @@ Optional Features: --enable-lcms2=[yes|no] Build with LCMS-2 support [default=yes] --enable-lcms1=[yes|no] Build with LCMS-1 support [default=yes] --enable-jpwl=[yes|no] Build with JPWL support [default=no] - --enable-shared=[yes|no] Build shared libs [default=no] + --enable-shared=[yes|no] Build shared libs [default=yes] --enable-jp3d=[yes|no] Build jp3d libs [default=no] Optional Packages: @@ -5866,13 +5867,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5869: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5870: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5872: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5873: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5875: output\"" >&5) + (eval echo "\"\$as_me:5876: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7063,7 +7064,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7066 "configure"' > conftest.$ac_ext + echo '#line 7067 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9054,11 +9055,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9057: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9058: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9061: \$? = $ac_status" >&5 + echo "$as_me:9062: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9393,11 +9394,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9396: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9397: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9400: \$? = $ac_status" >&5 + echo "$as_me:9401: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9498,11 +9499,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9501: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9502: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9505: \$? = $ac_status" >&5 + echo "$as_me:9506: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9553,11 +9554,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9556: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9557: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9560: \$? = $ac_status" >&5 + echo "$as_me:9561: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11920,7 +11921,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11923 "configure" +#line 11924 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12016,7 +12017,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12019 "configure" +#line 12020 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13972,11 +13973,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13975: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13976: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13979: \$? = $ac_status" >&5 + echo "$as_me:13980: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14071,11 +14072,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14074: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14075: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14078: \$? = $ac_status" >&5 + echo "$as_me:14079: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14123,11 +14124,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14126: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14127: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14130: \$? = $ac_status" >&5 + echo "$as_me:14131: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16064,12 +16065,12 @@ fi # ------------------------------- # Test for creating SHARED LIBS # ------------------------------- -with_sharedlibs="no" +with_sharedlibs="yes" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; test "$enable_shared" = "yes" && with_sharedlibs="yes" + enableval=$enable_shared; test "$enable_shared" = "no" && with_sharedlibs="no" fi # @@ -16144,9 +16145,12 @@ $as_echo "no" >&6; } fi -doxy_dir="" -if test "$with_doxygen" = "yes" ; then - dox_dir="doc" + if test x$with_doxygen = xyes; then + with_doxygen_TRUE= + with_doxygen_FALSE='#' +else + with_doxygen_TRUE='#' + with_doxygen_FALSE= fi # @@ -16314,6 +16318,10 @@ if test -z "${with_sharedlibs_TRUE}" && test -z "${with_sharedlibs_FALSE}"; then as_fn_error "conditional \"with_sharedlibs\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${with_doxygen_TRUE}" && test -z "${with_doxygen_FALSE}"; then + as_fn_error "conditional \"with_doxygen\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -18815,6 +18823,7 @@ echo "lcms2 version : $have_lcms2_version" echo "--enable-lcms1 : $with_liblcms1" echo "lcms1 header : $lcms1_header_found" echo "lcms1 version : $have_lcms1_version" -echo "jpwl support : $with_libjpwl" +echo "--enable-jpwl : $with_libjpwl" echo "--enable-jp3d : $with_jp3d" +echo "--enable-shared : $with_sharedlibs" echo "----------------------------------------------" diff --git a/configure.ac b/configure.ac index 405c448b..83c30ebe 100644 --- a/configure.ac +++ b/configure.ac @@ -392,11 +392,11 @@ AC_SUBST(jpwl_dir) # ------------------------------- # Test for creating SHARED LIBS # ------------------------------- -with_sharedlibs="no" +with_sharedlibs="yes" AC_MSG_CHECKING(whether to build shared libraries) AC_ARG_ENABLE(shared, - [ --enable-shared[=[yes|no]] Build shared libs [ [default=no] ]], - test "$enable_shared" = "yes" && with_sharedlibs="yes") + [ --enable-shared[=[yes|no]] Build shared libs [ [default=yes] ]], + test "$enable_shared" = "no" && with_sharedlibs="no") # AC_MSG_RESULT($with_sharedlibs) AM_CONDITIONAL([with_sharedlibs], [test x$with_sharedlibs = xyes]) @@ -420,11 +420,7 @@ AC_SUBST(jp3d_dir) AC_SUBST(LDLIBS) # AC_CHECK_PROG(with_doxygen, doxygen, [yes],[no],,) -doxy_dir="" -if test "$with_doxygen" = "yes" ; then - dox_dir="doc" -fi -AC_SUBST(doxy_dir) +AM_CONDITIONAL([with_doxygen], [test x$with_doxygen = xyes]) # AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([libopenjpeg/Makefile]) @@ -450,6 +446,7 @@ echo "lcms2 version : $have_lcms2_version" echo "--enable-lcms1 : $with_liblcms1" echo "lcms1 header : $lcms1_header_found" echo "lcms1 version : $have_lcms1_version" -echo "jpwl support : $with_libjpwl" +echo "--enable-jpwl : $with_libjpwl" echo "--enable-jp3d : $with_jp3d" +echo "--enable-shared : $with_sharedlibs" echo "----------------------------------------------" diff --git a/doc/Makefile.am b/doc/Makefile.am index 91e92204..cdd2dd73 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,9 +2,38 @@ MAJOR = @MAJOR_NR@ MINOR = @MINOR_NR@ BUILD = @BUILD_NR@ -docdir = $(datarootdir)/doc/openjpeg-$(MAJOR).$(MINOR) - -dist_doc_DATA = ../license.txt ../ChangeLog - +if with_doxygen docs: doxygen Doxyfile.dox +endif + +doc_dir = $(datarootdir)/doc/openjpeg-$(MAJOR).$(MINOR) + +all-local: + @echo "" > .report.txt + @echo "Installing: image_to_j2k.1 ${mandir}/man1" >> .report.txt + @echo "Installing: j2k_to_image.1 ${mandir}/man1" >> .report.txt + @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt + @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt + @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt + +install-data-hook: + $(INSTALL) -d $(doc_dir) + $(INSTALL) -d ${mandir}/man1 ${mandir}/man3 +if with_libjpwl + (cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) + (cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) +endif + (cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) + (cd ${mandir}/man3 && $(RM) libopenjpeg* ) + gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 + cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 + cp libopenjpeg.3.gz ${mandir}/man3 + gunzip *\.gz +if with_libjpwl + (cd ${mandir}/man1 && \ + $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ + $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) + (cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) +endif + cp ../LICENSE ../CHANGES $(doc_dir) diff --git a/doc/Makefile.in b/doc/Makefile.in index 3593f940..6f0e168f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -14,7 +14,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -36,8 +35,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = doc -DIST_COMMON = $(dist_doc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -48,29 +46,6 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(docdir)" -DATA = $(dist_doc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -167,8 +142,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -docdir = $(datarootdir)/doc/openjpeg-$(MAJOR).$(MINOR) -doxy_dir = @doxy_dir@ +docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -218,7 +192,7 @@ with_doxygen = @with_doxygen@ MAJOR = @MAJOR_NR@ MINOR = @MINOR_NR@ BUILD = @BUILD_NR@ -dist_doc_DATA = ../license.txt ../ChangeLog +doc_dir = $(datarootdir)/doc/openjpeg-$(MAJOR).$(MINOR) all: all-am .SUFFIXES: @@ -258,26 +232,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-dist_docDATA: $(dist_doc_DATA) - @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" - @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ - done - -uninstall-dist_docDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files tags: TAGS TAGS: @@ -317,11 +271,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(DATA) +all-am: Makefile all-local installdirs: - for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -367,8 +318,9 @@ info: info-am info-am: -install-data-am: install-dist_docDATA - +install-data-am: + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am install-dvi-am: @@ -411,25 +363,50 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_docDATA +uninstall-am: -.MAKE: install-am install-strip +.MAKE: install-am install-data-am install-strip -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_docDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_docDATA +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-hook \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am -docs: - doxygen Doxyfile.dox +@with_doxygen_TRUE@docs: +@with_doxygen_TRUE@ doxygen Doxyfile.dox + +all-local: + @echo "" > .report.txt + @echo "Installing: image_to_j2k.1 ${mandir}/man1" >> .report.txt + @echo "Installing: j2k_to_image.1 ${mandir}/man1" >> .report.txt + @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt + @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt + @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt + +install-data-hook: + $(INSTALL) -d $(doc_dir) + $(INSTALL) -d ${mandir}/man1 ${mandir}/man3 +@with_libjpwl_TRUE@ (cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) +@with_libjpwl_TRUE@ (cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) + (cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) + (cd ${mandir}/man3 && $(RM) libopenjpeg* ) + gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 + cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 + cp libopenjpeg.3.gz ${mandir}/man3 + gunzip *\.gz +@with_libjpwl_TRUE@ (cd ${mandir}/man1 && \ +@with_libjpwl_TRUE@ $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ +@with_libjpwl_TRUE@ $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) +@with_libjpwl_TRUE@ (cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) + cp ../LICENSE ../CHANGES $(doc_dir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/Makefile.nix b/doc/Makefile.nix index 4028834b..fae568dd 100644 --- a/doc/Makefile.nix +++ b/doc/Makefile.nix @@ -1,18 +1,45 @@ -#doc/Makefile +#doc Makefile.nix include ../config.nix -ifeq ($(HAS_DOXYGEN),yes) -docdir = $(prefix)/share/doc/openjpeg-$(MAJOR).$(MINOR) +doc_dir = $(prefix)/share/doc/openjpeg-$(MAJOR).$(MINOR) +man_dir = $(prefix)/share/man -all: +ifeq ($(HAS_DOXYGEN),yes) +docs: doxygen Doxyfile.dox -install: all - install -d $(docdir) - cp -rf html $(docdir) - cp -f ../license.txt ../ChangeLog $(docdir) +endif clean: rm -rf html +install: + install -d $(doc_dir) + install -d $(man_dir)/man1 $(man_dir)/man3 +ifeq ($(WITH_JPWL),yes) + (cd $(man_dir)/man1 && rm -f JPWL_image_to_j2k* JPWL_j2k_to_image* ) + (cd $(man_dir)/man3 && rm -f JPWL_libopenjpeg* ) endif + (cd $(man_dir)/man1 && rm -f image_to_j2k* j2k_to_image* j2k_dump* ) + (cd $(man_dir)/man3 && rm -f libopenjpeg* ) + gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 + cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(man_dir)/man1 + cp libopenjpeg.3.gz $(man_dir)/man3 + gunzip *\.gz +ifeq ($(WITH_JPWL),yes) + (cd $(man_dir)/man1 && \ + ln -sf image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ + ln -sf j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) + (cd $(man_dir)/man3 && ln -sf libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) +endif + cp ../LICENSE ../CHANGES $(doc_dir) + +uninstall: + rm -rf $(doc_dir) +ifeq ($(WITH_JPWL),yes) + (cd $(man_dir)/man1 && rm -f JPWL_image_to_j2k* JPWL_j2k_to_image* ) + (cd $(man_dir)/man3 && rm -f JPWL_libopenjpeg* ) +endif + (cd $(man_dir)/man1 && rm -f image_to_j2k* j2k_to_image* j2k_dump* ) + (cd $(man_dir)/man3 && rm -f libopenjpeg* ) + diff --git a/jp3d/Makefile.in b/jp3d/Makefile.in index 0800924b..7f1370e1 100644 --- a/jp3d/Makefile.in +++ b/jp3d/Makefile.in @@ -183,7 +183,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ diff --git a/jp3d/Makefile.nix b/jp3d/Makefile.nix index b65ed2ed..d153dbe0 100644 --- a/jp3d/Makefile.nix +++ b/jp3d/Makefile.nix @@ -96,7 +96,7 @@ uninstall: rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB) ifeq ($(ENABLE_SHARED),yes) (cd $(DESTDIR)$(INSTALL_LIBDIR) && \ - rm $(LIBNAME).so $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(SHAREDLIB)) + rm -f $(LIBNAME).so $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(SHAREDLIB)) endif ldconfig rm -f $(DESTDIR)$(prefix)/include/openjpeg3d.h diff --git a/jp3d/codec/Makefile.am b/jp3d/codec/Makefile.am index 9e36582a..ae299e3d 100644 --- a/jp3d/codec/Makefile.am +++ b/jp3d/codec/Makefile.am @@ -2,7 +2,7 @@ USERLIBS = INCLUDES = -I. -I../libjp3dvm -CFLAGS = -Wall $(INCLUDES) +CFLAGS = -Wall $(INCLUDES) -static bin_PROGRAMS = jp3d_to_volume volume_to_jp3d LDADD = $(USERLIBS) ../libjp3dvm/libopenjp3dvm.la diff --git a/jp3d/codec/Makefile.in b/jp3d/codec/Makefile.in index d2239034..950c5a20 100644 --- a/jp3d/codec/Makefile.in +++ b/jp3d/codec/Makefile.in @@ -92,7 +92,7 @@ AWK = @AWK@ BUILD_NR = @BUILD_NR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = -Wall $(INCLUDES) +CFLAGS = -Wall $(INCLUDES) -static CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -177,7 +177,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ diff --git a/jp3d/libjp3dvm/Makefile.in b/jp3d/libjp3dvm/Makefile.in index b15942a3..71c85b27 100644 --- a/jp3d/libjp3dvm/Makefile.in +++ b/jp3d/libjp3dvm/Makefile.in @@ -195,7 +195,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am index 3f80e738..e379bde0 100644 --- a/jpwl/Makefile.am +++ b/jpwl/Makefile.am @@ -38,7 +38,7 @@ DOS2UNIX = dos2unix dos2unix: @$(DOS2UNIX) $(SRCS) $(INCLS) -COMPILERFLAGS = -Wall -ffast-math -std=c99 +COMPILERFLAGS = -Wall -ffast-math -std=c99 -static USERLIBS = -lm INCLUDES = -I.. -I. -I../libopenjpeg diff --git a/jpwl/Makefile.in b/jpwl/Makefile.in index 8fdba662..93b0e21f 100644 --- a/jpwl/Makefile.in +++ b/jpwl/Makefile.in @@ -223,7 +223,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -303,7 +302,7 @@ libopenjpeg_JPWL_la_LIBADD = @LDLIBS@ # Converts cr/lf to just lf DOS2UNIX = dos2unix -COMPILERFLAGS = -Wall -ffast-math -std=c99 +COMPILERFLAGS = -Wall -ffast-math -std=c99 -static USERLIBS = -lm $(am__append_2) $(am__append_4) $(am__append_6) \ $(am__append_8) INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3) \ diff --git a/jpwl/Makefile.nix b/jpwl/Makefile.nix index 40874565..c78c0d71 100644 --- a/jpwl/Makefile.nix +++ b/jpwl/Makefile.nix @@ -139,7 +139,7 @@ uninstall: rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB) ifeq ($(ENABLE_SHARED),yes) (cd $(DESTDIR)$(INSTALL_LIBDIR) && \ - rm $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB)) + rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB)) endif ldconfig rm -f $(DESTDIR)$(INSTALL_BIN)/JPWL_j2k_to_image diff --git a/libopenjpeg/Makefile.in b/libopenjpeg/Makefile.in index 6f9a06e9..acaed748 100644 --- a/libopenjpeg/Makefile.in +++ b/libopenjpeg/Makefile.in @@ -197,7 +197,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ diff --git a/mj2/Makefile.am b/mj2/Makefile.am index fbf5c9de..b5495387 100644 --- a/mj2/Makefile.am +++ b/mj2/Makefile.am @@ -1,13 +1,8 @@ -COMPILERFLAGS = -Wall +COMPILERFLAGS = -Wall -static USERLIBS = INCLUDES = -I.. -I. -I../libopenjpeg -if with_libjpwl -USERLIBS += -L../jpwl -lopenjpeg_JPWL -COMPILERFLAGS += -DUSE_JPWL -endif - if with_liblcms2 INCLUDES += @lcms2includes@ USERLIBS += @lcms2libs@ diff --git a/mj2/Makefile.in b/mj2/Makefile.in index 629da68f..e4149063 100644 --- a/mj2/Makefile.in +++ b/mj2/Makefile.in @@ -35,12 +35,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@with_libjpwl_TRUE@am__append_1 = -L../jpwl -lopenjpeg_JPWL -@with_libjpwl_TRUE@am__append_2 = -DUSE_JPWL -@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@ +@with_liblcms2_TRUE@am__append_1 = @lcms2includes@ +@with_liblcms2_TRUE@am__append_2 = @lcms2libs@ +@with_liblcms1_TRUE@am__append_3 = @lcms1includes@ +@with_liblcms1_TRUE@am__append_4 = @lcms1libs@ bin_PROGRAMS = frames_to_mj2$(EXEEXT) mj2_to_frames$(EXEEXT) \ extract_j2k_from_mj2$(EXEEXT) wrap_j2k_in_mj2$(EXEEXT) subdir = mj2 @@ -60,8 +58,7 @@ am_extract_j2k_from_mj2_OBJECTS = mj2.$(OBJEXT) \ extract_j2k_from_mj2_OBJECTS = $(am_extract_j2k_from_mj2_OBJECTS) extract_j2k_from_mj2_LDADD = $(LDADD) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) extract_j2k_from_mj2_DEPENDENCIES = ../libopenjpeg/libopenjpeg.la \ $(am__DEPENDENCIES_2) am_frames_to_mj2_OBJECTS = getopt.$(OBJEXT) mj2_convert.$(OBJEXT) \ @@ -198,7 +195,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -245,9 +241,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ with_doxygen = @with_doxygen@ -COMPILERFLAGS = -Wall $(am__append_2) -USERLIBS = $(am__append_1) $(am__append_4) $(am__append_6) -INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_3) $(am__append_5) +COMPILERFLAGS = -Wall -static +USERLIBS = $(am__append_2) $(am__append_4) +INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3) LDADD = ../libopenjpeg/libopenjpeg.la $(USERLIBS) frames_to_mj2_SOURCES = ../codec/compat/getopt.c mj2_convert.c mj2.c \ frames_to_mj2.c diff --git a/mj2/Makefile.nix b/mj2/Makefile.nix index 574d5e24..4a76c59a 100644 --- a/mj2/Makefile.nix +++ b/mj2/Makefile.nix @@ -1,4 +1,4 @@ -#jpwl Makefile +#mj2 Makefile.nix include ../config.nix CFLAGS = -Wall @@ -7,11 +7,6 @@ INSTALL_BIN = $(prefix)/bin USERLIBS = -lm INCLUDE = -I.. -I. -I../libopenjpeg -ifeq ($(WITH_JPWL),yes) -USERLIBS += ../jpwl/libopenjpeg_JPWL.a -#CFLAGS += -DUSE_JPWL -endif - ifeq ($(WITH_LCMS2),yes) INCLUDE += $(LCMS2_INCLUDE) USERLIBS += $(LCMS2_LIB) diff --git a/opj_config.h.in.user b/opj_config.h.in.user index 7f8b0b79..f86ccce6 100644 --- a/opj_config.h.in.user +++ b/opj_config.h.in.user @@ -13,8 +13,8 @@ * * * The file 'opj_config.h' will be included in some source files. - * You can not compile without it. - * Do not forget to change the Makefile.nix/Makefile.osx + * ==== YOU CAN NOT COMPILE WITHOUT IT. ==== + * === DO NOT FOREGET TO CHANGE 'config.nix' APPROPRIATELY. ==== */ /* DO NOT DEFINE BOTH VERSIONS OF LCMS */