[trunk] Sync OPJViewer with 1.5 version

[openjpeg.git] / applications / Makefile.am

diff --git a/applications/Makefile.am b/applications/Makefile.am
index e7d11e52f88bbd3d7daf38aae27fd444c234db69..63dae6d5b9cb673f35b3a33fa6af6ec5fa2ff00d 100644 (file)
--- a/applications/Makefile.am
+++ b/applications/Makefile.am
@@ -6,7 +6,7 @@ if WANT_MJ2
 SUBDIRS += mj2
 endif
 
-if WANT_JPIP
+if WANT_JPIP_CODE
 SUBDIRS += jpip
 endif
 
@@ -15,5 +15,5 @@ CMakeLists.txt \
 common/color.c \
 common/color.h \
 common/format_defs.h \
-common/getopt.c \
-common/getopt.h
+common/opj_getopt.c \
+common/opj_getopt.h