From 41a07019cabe651fb6d7a424ab40c01c9e8a66b0 Mon Sep 17 00:00:00 2001
From: Winfried <szukw000@arcor.de>
Date: Sun, 17 Oct 2010 22:42:46 +0000
Subject: [PATCH] -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
---
 Makefile.in           | 1 -
 Makefile.nix          | 2 +-
 codec/Makefile.am     | 2 +-
 codec/Makefile.in     | 3 +--
 libjp3dvm/Makefile.in | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0800924b..7f1370e1 100644
--- a/Makefile.in
+++ b/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/Makefile.nix b/Makefile.nix
index b65ed2ed..d153dbe0 100644
--- a/Makefile.nix
+++ b/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/codec/Makefile.am b/codec/Makefile.am
index 9e36582a..ae299e3d 100644
--- a/codec/Makefile.am
+++ b/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/codec/Makefile.in b/codec/Makefile.in
index d2239034..950c5a20 100644
--- a/codec/Makefile.in
+++ b/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/libjp3dvm/Makefile.in b/libjp3dvm/Makefile.in
index b15942a3..71c85b27 100644
--- a/libjp3dvm/Makefile.in
+++ b/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@