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

-This line, and those below, will be ignored-- 

M    configure
M    Makefile.in
M    opj_config.h.in.user
M    mj2/Makefile.in
M    mj2/Makefile.am
M    mj2/Makefile.nix
M    libopenjpeg/Makefile.in
M    jp3d/Makefile.in
M    jp3d/libjp3dvm/Makefile.in
M    jp3d/Makefile.nix
M    jp3d/codec/Makefile.in
M    jp3d/codec/Makefile.am
M    config.nix
M    configure.ac
M    doc/Makefile.in
M    doc/Makefile.am
M    doc/Makefile.nix
M    INSTALL
M    CHANGES
M    jpwl/Makefile.in
M    jpwl/Makefile.am
M    jpwl/Makefile.nix
M    Makefile.am
M    Makefile.nix
M    codec/Makefile.in
M    codec/Makefile.am
This commit is contained in:
Winfried 2010-10-17 22:42:46 +00:00
parent a9fc37e19f
commit 41a07019ca
5 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -183,7 +183,6 @@ builddir = @builddir@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
docdir = @docdir@ docdir = @docdir@
doxy_dir = @doxy_dir@
dvidir = @dvidir@ dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
host = @host@ host = @host@

2
Makefile.nix
View File

@ -96,7 +96,7 @@ uninstall:
rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB) rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)
ifeq ($(ENABLE_SHARED),yes) ifeq ($(ENABLE_SHARED),yes)
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \ (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 endif
ldconfig ldconfig
rm -f $(DESTDIR)$(prefix)/include/openjpeg3d.h rm -f $(DESTDIR)$(prefix)/include/openjpeg3d.h

2
codec/Makefile.am
View File

@ -2,7 +2,7 @@
USERLIBS = USERLIBS =
INCLUDES = -I. -I../libjp3dvm INCLUDES = -I. -I../libjp3dvm
CFLAGS = -Wall $(INCLUDES) CFLAGS = -Wall $(INCLUDES) -static
bin_PROGRAMS = jp3d_to_volume volume_to_jp3d bin_PROGRAMS = jp3d_to_volume volume_to_jp3d
LDADD = $(USERLIBS) ../libjp3dvm/libopenjp3dvm.la LDADD = $(USERLIBS) ../libjp3dvm/libopenjp3dvm.la

3
codec/Makefile.in
View File

@ -92,7 +92,7 @@ AWK = @AWK@
BUILD_NR = @BUILD_NR@ BUILD_NR = @BUILD_NR@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = -Wall $(INCLUDES) CFLAGS = -Wall $(INCLUDES) -static
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CXX = @CXX@ CXX = @CXX@
@ -177,7 +177,6 @@ builddir = @builddir@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
docdir = @docdir@ docdir = @docdir@
doxy_dir = @doxy_dir@
dvidir = @dvidir@ dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
host = @host@ host = @host@

1
libjp3dvm/Makefile.in
View File

@ -195,7 +195,6 @@ builddir = @builddir@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
docdir = @docdir@ docdir = @docdir@
doxy_dir = @doxy_dir@
dvidir = @dvidir@ dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
host = @host@ host = @host@