-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:
parent
a9fc37e19f
commit
41a07019ca
|
@ -183,7 +183,6 @@ builddir = @builddir@
|
|||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
doxy_dir = @doxy_dir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -195,7 +195,6 @@ builddir = @builddir@
|
|||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
doxy_dir = @doxy_dir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
|
|
Loading…
Reference in New Issue