walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

M jp3d/Makefile.nix 

M    config.nix
M    doc/Makefile.in
M    doc/Makefile.am
M    doc/Makefile.nix
M    CHANGES
M    jpwl/Makefile.nix
M    Makefile.nix
This commit is contained in:
Winfried 2010-10-18 00:17:19 +00:00
parent f4b08bacb0
commit e65ef3a24f
8 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -5,6 +5,15 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
October 18, 2010
! [szukw000]
doc/Makefile.am
doc/Makefile.nix
jp3d/Makefile.nix
jpwl/Makefile.nix
Makefile.nix
config.nix
October 17, 2010 October 17, 2010
- [szukw000] doc/man/ : directory removed - [szukw000] doc/man/ : directory removed
! [szukw000] ! [szukw000]

8
Makefile.nix
View File

@ -114,7 +114,7 @@ endif
ifeq ($(WITH_JP3D),yes) ifeq ($(WITH_JP3D),yes)
make -C jp3d -f Makefile.nix install make -C jp3d -f Makefile.nix install
endif endif
ldconfig $(LDCONFIG)
make -C doc -f Makefile.nix install make -C doc -f Makefile.nix install
ifeq ($(WITH_JPWL),yes) ifeq ($(WITH_JPWL),yes)
@ -123,7 +123,7 @@ jpwl-all:
jpwl-install: jpwl-all jpwl-install: jpwl-all
make -C jpwl -f Makefile.nix install make -C jpwl -f Makefile.nix install
ldconfig $(LDCONFIG)
jpwl-clean: jpwl-clean:
make -C jpwl -f Makefile.nix clean make -C jpwl -f Makefile.nix clean
@ -138,7 +138,7 @@ jp3d-all:
jp3d-install: jp3d-all jp3d-install: jp3d-all
make -C jp3d -f Makefile.nix install make -C jp3d -f Makefile.nix install
ldconfig $(LDCONFIG)
jp3d-clean: jp3d-clean:
make -C jp3d -f Makefile.nix clean make -C jp3d -f Makefile.nix clean
@ -175,7 +175,7 @@ ifeq ($(ENABLE_SHARED),yes)
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \ (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB) ) rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB) )
endif endif
ldconfig $(LDCONFIG)
rm -f $(DESTDIR)$(prefix)/include/openjpeg.h rm -f $(DESTDIR)$(prefix)/include/openjpeg.h
rm -rf $(DESTDIR)$(INSTALL_INCLUDE) rm -rf $(DESTDIR)$(INSTALL_INCLUDE)
make -C codec -f Makefile.nix uninstall make -C codec -f Makefile.nix uninstall

19
config.nix
View File

@ -6,10 +6,11 @@ JP3D_MAJOR = 1
JP3D_MINOR = 3 JP3D_MINOR = 3
JP3D_BUILD = 0 JP3D_BUILD = 0
prefix=/usr/local/OPJ646 prefix=/usr/local
CC = gcc CC = gcc
LDCONFIG = /sbin/ldconfig
#Set this to yes if you want to compile/install shared libs. #
#Set this to no if you do no want to compile/install shared libs.
ENABLE_SHARED = yes ENABLE_SHARED = yes
# #
#Set to yes if you BOTH have the library AND the header #Set to yes if you BOTH have the library AND the header
@ -18,19 +19,19 @@ ENABLE_SHARED = yes
#==== HAVE YOU CREATED opj_config.h FROM opj_config.h.in.user ? ==== #==== HAVE YOU CREATED opj_config.h FROM opj_config.h.in.user ? ====
#==== SHOULD BE IN SYNC WITH opj_config.h ==== #==== SHOULD BE IN SYNC WITH opj_config.h ====
WITH_LCMS1 = no WITH_LCMS1 = no
WITH_LCMS2 = yes WITH_LCMS2 = no
WITH_PNG = yes WITH_PNG = no
WITH_TIFF = yes WITH_TIFF = no
# #
# Set to yes if you want compile/install # Set to yes if you want compile/install
# jpwl libraries/binaries # jpwl libraries/binaries
# jp3d libraries/binaries # jp3d libraries/binaries
WITH_JPWL = yes WITH_JPWL = no
WITH_JP3D = yes WITH_JP3D = no
# #
#Set to yes if you have doxygen installed #Set to yes if you have doxygen installed
#Set to no if doxygen is missing. #Set to no if doxygen is missing.
HAS_DOXYGEN = yes HAS_DOXYGEN = no
#Check whether these paths are correct; change them appropiatly. #Check whether these paths are correct; change them appropiatly.
LCMS1_INCLUDE = -I/usr/include LCMS1_INCLUDE = -I/usr/include

4
doc/Makefile.am
View File

@ -16,6 +16,8 @@ all-local:
@echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt
@echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt
@echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt
cp man/man1/* .
cp man/man3/* .
install-data-hook: install-data-hook:
$(INSTALL) -d $(doc_dir) $(INSTALL) -d $(doc_dir)
@ -29,7 +31,7 @@ endif
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 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 image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
cp libopenjpeg.3.gz ${mandir}/man3 cp libopenjpeg.3.gz ${mandir}/man3
gunzip *\.gz $(RM) *\.gz
if with_libjpwl if with_libjpwl
(cd ${mandir}/man1 && \ (cd ${mandir}/man1 && \
$(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \

4
doc/Makefile.in
View File

@ -390,6 +390,8 @@ all-local:
@echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt @echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt
@echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt @echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt
@echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt @echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt
cp man/man1/* .
cp man/man3/* .
install-data-hook: install-data-hook:
$(INSTALL) -d $(doc_dir) $(INSTALL) -d $(doc_dir)
@ -401,7 +403,7 @@ install-data-hook:
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 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 image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
cp libopenjpeg.3.gz ${mandir}/man3 cp libopenjpeg.3.gz ${mandir}/man3
gunzip *\.gz $(RM) *\.gz
@with_libjpwl_TRUE@ (cd ${mandir}/man1 && \ @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) 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@ $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz)

8
doc/Makefile.nix
View File

@ -14,6 +14,8 @@ clean:
rm -rf html rm -rf html
install: install:
cp man/man1/* .
cp man/man3/* .
install -d $(doc_dir) install -d $(doc_dir)
install -d $(man_dir)/man1 $(man_dir)/man3 install -d $(man_dir)/man1 $(man_dir)/man3
ifeq ($(WITH_JPWL),yes) ifeq ($(WITH_JPWL),yes)
@ -23,9 +25,9 @@ endif
(cd $(man_dir)/man1 && rm -f image_to_j2k* j2k_to_image* j2k_dump* ) (cd $(man_dir)/man1 && rm -f image_to_j2k* j2k_to_image* j2k_dump* )
(cd $(man_dir)/man3 && rm -f libopenjpeg* ) (cd $(man_dir)/man3 && rm -f libopenjpeg* )
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 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 -f image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(man_dir)/man1
cp libopenjpeg.3.gz $(man_dir)/man3 cp -f libopenjpeg.3.gz $(man_dir)/man3
gunzip *\.gz rm -f *\.gz
ifeq ($(WITH_JPWL),yes) ifeq ($(WITH_JPWL),yes)
(cd $(man_dir)/man1 && \ (cd $(man_dir)/man1 && \
ln -sf image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ ln -sf image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \

4
jp3d/Makefile.nix
View File

@ -83,7 +83,7 @@ ifeq ($(ENABLE_SHARED),yes)
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \ (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
ln -sf $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(LIBNAME).so ) ln -sf $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(LIBNAME).so )
endif endif
ldconfig $(LDCONFIG)
install -d $(DESTDIR)$(INSTALL_INCLUDE) install -d $(DESTDIR)$(INSTALL_INCLUDE)
rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg.h rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg.h
install -m 644 -o root -g root libjp3dvm/openjpeg.h \ install -m 644 -o root -g root libjp3dvm/openjpeg.h \
@ -98,7 +98,7 @@ ifeq ($(ENABLE_SHARED),yes)
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \ (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
rm -f $(LIBNAME).so $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(SHAREDLIB)) rm -f $(LIBNAME).so $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(SHAREDLIB))
endif endif
ldconfig $(LDCONFIG)
rm -f $(DESTDIR)$(prefix)/include/openjpeg3d.h rm -f $(DESTDIR)$(prefix)/include/openjpeg3d.h
rm -rf $(DESTDIR)$(INSTALL_INCLUDE) rm -rf $(DESTDIR)$(INSTALL_INCLUDE)
make -C codec -f Makefile.nix uninstall make -C codec -f Makefile.nix uninstall

4
jpwl/Makefile.nix
View File

@ -121,7 +121,7 @@ ifeq ($(ENABLE_SHARED),yes)
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \ (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
ln -sf $(LIBNAME).so.$(MAJOR).$(MINOR) $(LIBNAME).so ) ln -sf $(LIBNAME).so.$(MAJOR).$(MINOR) $(LIBNAME).so )
endif endif
ldconfig $(LDCONFIG)
install -d $(DESTDIR)$(INSTALL_BIN) install -d $(DESTDIR)$(INSTALL_BIN)
install -m 755 -o root -g root JPWL_j2k_to_image $(DESTDIR)$(INSTALL_BIN) install -m 755 -o root -g root JPWL_j2k_to_image $(DESTDIR)$(INSTALL_BIN)
install -m 755 -o root -g root JPWL_image_to_j2k $(DESTDIR)$(INSTALL_BIN) install -m 755 -o root -g root JPWL_image_to_j2k $(DESTDIR)$(INSTALL_BIN)
@ -141,6 +141,6 @@ ifeq ($(ENABLE_SHARED),yes)
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \ (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB)) rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB))
endif endif
ldconfig $(LDCONFIG)
rm -f $(DESTDIR)$(INSTALL_BIN)/JPWL_j2k_to_image rm -f $(DESTDIR)$(INSTALL_BIN)/JPWL_j2k_to_image
rm -f $(DESTDIR)$(INSTALL_BIN)/JPWL_image_to_j2k rm -f $(DESTDIR)$(INSTALL_BIN)/JPWL_image_to_j2k