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

[openjpeg.git] / mj2 / Makefile.nix

diff --git a/mj2/Makefile.nix b/mj2/Makefile.nix
index 7c962fdd8a2fcfc122a9e59aff3bf020658ad322..574d5e245e4fdf1fb9e8b341822b4d413064435b 100644 (file)
--- a/mj2/Makefile.nix
+++ b/mj2/Makefile.nix
@@ -30,11 +30,11 @@ all: frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
        wrap_j2k_in_mj2 ../bin
 
 frames_to_mj2: frames_to_mj2.c ../libopenjpeg.a
-       $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c \
+       $(CC) $(CFLAGS) ../codec/compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c \
        -o frames_to_mj2 ../libopenjpeg.a $(USERLIBS)
 
 mj2_to_frames: mj2_to_frames.c ../libopenjpeg.a
-       $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c \
+       $(CC) $(CFLAGS) ../codec/compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c \
        -o mj2_to_frames ../libopenjpeg.a $(USERLIBS)
 
 extract_j2k_from_mj2: extract_j2k_from_mj2.c ../libopenjpeg.a