-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

3 files changed, 10 insertions, 24 deletions

diff --git a/mj2/Makefile.am b/mj2/Makefile.am
index fbf5c9de..b5495387 100644
--- a/mj2/Makefile.am
+++ b/mj2/Makefile.am
@@ -1,13 +1,8 @@
-COMPILERFLAGS = -Wall
+COMPILERFLAGS = -Wall -static
 
 USERLIBS =
 INCLUDES = -I.. -I. -I../libopenjpeg
 
-if with_libjpwl
-USERLIBS += -L../jpwl -lopenjpeg_JPWL
-COMPILERFLAGS += -DUSE_JPWL
-endif
-
 if with_liblcms2
 INCLUDES += @lcms2includes@
 USERLIBS += @lcms2libs@
diff --git a/mj2/Makefile.in b/mj2/Makefile.in
index 629da68f..e4149063 100644
--- a/mj2/Makefile.in
+++ b/mj2/Makefile.in
@@ -35,12 +35,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@with_libjpwl_TRUE@am__append_1 = -L../jpwl -lopenjpeg_JPWL
-@with_libjpwl_TRUE@am__append_2 = -DUSE_JPWL
-@with_liblcms2_TRUE@am__append_3 = @lcms2includes@
-@with_liblcms2_TRUE@am__append_4 = @lcms2libs@
-@with_liblcms1_TRUE@am__append_5 = @lcms1includes@
-@with_liblcms1_TRUE@am__append_6 = @lcms1libs@
+@with_liblcms2_TRUE@am__append_1 = @lcms2includes@
+@with_liblcms2_TRUE@am__append_2 = @lcms2libs@
+@with_liblcms1_TRUE@am__append_3 = @lcms1includes@
+@with_liblcms1_TRUE@am__append_4 = @lcms1libs@
 bin_PROGRAMS = frames_to_mj2$(EXEEXT) mj2_to_frames$(EXEEXT) \
 	extract_j2k_from_mj2$(EXEEXT) wrap_j2k_in_mj2$(EXEEXT)
 subdir = mj2
@@ -60,8 +58,7 @@ am_extract_j2k_from_mj2_OBJECTS = mj2.$(OBJEXT) \
 extract_j2k_from_mj2_OBJECTS = $(am_extract_j2k_from_mj2_OBJECTS)
 extract_j2k_from_mj2_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 extract_j2k_from_mj2_DEPENDENCIES = ../libopenjpeg/libopenjpeg.la \
 	$(am__DEPENDENCIES_2)
 am_frames_to_mj2_OBJECTS = getopt.$(OBJEXT) mj2_convert.$(OBJEXT) \
@@ -198,7 +195,6 @@ builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
-doxy_dir = @doxy_dir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -245,9 +241,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_doxygen = @with_doxygen@
-COMPILERFLAGS = -Wall $(am__append_2)
-USERLIBS = $(am__append_1) $(am__append_4) $(am__append_6)
-INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_3) $(am__append_5)
+COMPILERFLAGS = -Wall -static
+USERLIBS = $(am__append_2) $(am__append_4)
+INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3)
 LDADD = ../libopenjpeg/libopenjpeg.la $(USERLIBS)
 frames_to_mj2_SOURCES = ../codec/compat/getopt.c mj2_convert.c mj2.c \
  frames_to_mj2.c
diff --git a/mj2/Makefile.nix b/mj2/Makefile.nix
index 574d5e24..4a76c59a 100644
--- a/mj2/Makefile.nix
+++ b/mj2/Makefile.nix
@@ -1,4 +1,4 @@
-#jpwl Makefile
+#mj2 Makefile.nix
 include ../config.nix
 
 CFLAGS = -Wall
@@ -7,11 +7,6 @@ INSTALL_BIN = $(prefix)/bin
 USERLIBS = -lm
 INCLUDE = -I.. -I. -I../libopenjpeg
 
-ifeq ($(WITH_JPWL),yes)
-USERLIBS += ../jpwl/libopenjpeg_JPWL.a
-#CFLAGS += -DUSE_JPWL
-endif
-
 ifeq ($(WITH_LCMS2),yes)
 INCLUDE += $(LCMS2_INCLUDE)
 USERLIBS += $(LCMS2_LIB)