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

1. The jp3d/libjp3dvm/Makefile.am has been changed: 

Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/
Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/openjpeg3d.h

PREFIX/include:

   23  openjpeg.h -> openjpeg-1.4/openjpeg.h
   27  openjpeg3d.h -> openjpeg3d-1.3/openjpeg3d.h

28773  openjpeg-1.4/openjpeg.h
22158  openjpeg3d-1.3/openjpeg3d.h
	
2. The jp3d/Makefile.nix has been changed respectivly.
	
3. The mj2/Makefile.nix contained a wrong path to 'compat/'
	
4. opj_config.h.in.user contained a comment within a comment.
	
5. 'autoreconf' reported that AC_PROG_RANLIB is no longer necessary in 'configure.ac'.
This commit is contained in:
Antonin Descampe 2010-10-10 21:17:18 +00:00
parent 3caa4f8f4f
commit abac838cf4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.nix
View File

@ -85,10 +85,11 @@ ifeq ($(ENABLE_SHARED),yes)
endif endif
ldconfig ldconfig
install -d $(DESTDIR)$(INSTALL_INCLUDE) install -d $(DESTDIR)$(INSTALL_INCLUDE)
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 \
$(DESTDIR)$(INSTALL_INCLUDE) $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h
(cd $(DESTDIR)$(prefix)/include && \ (cd $(DESTDIR)$(prefix)/include && \
ln -sf $(headerdir)/openjpeg.h openjpeg3d.h) ln -sf $(headerdir)/openjpeg3d.h openjpeg3d.h)
make -C codec -f Makefile.nix install make -C codec -f Makefile.nix install
uninstall: uninstall:

5
libjp3dvm/Makefile.am
View File

@ -46,7 +46,7 @@ all-local:
@rm -f .report_lib/libopenjp3dvm.lai @rm -f .report_lib/libopenjp3dvm.lai
@echo "" > ../.report.txt @echo "" > ../.report.txt
@echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt
@echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt
@(cd .report_lib; \ @(cd .report_lib; \
l=`ls --file-type`; \ l=`ls --file-type`; \
for f in $$l ; do \ for f in $$l ; do \
@ -56,8 +56,9 @@ all-local:
install-data-hook: install-data-hook:
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h) (cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
(cd ${prefix}/include/${headerdir} && mv openjpeg.h openjpeg3d.h)
(cd $(DESTDIR)${prefix}/include && \ (cd $(DESTDIR)${prefix}/include && \
$(LN_S) ${headerdir}/openjpeg.h openjpeg3d.h) $(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)
uninstall-hook: uninstall-hook:
(cd $(DESTDIR)${prefix}/include && rm -rf openjpeg3d.h ${headerdir}) (cd $(DESTDIR)${prefix}/include && rm -rf openjpeg3d.h ${headerdir})