1 diff -Naur ../libecwj2-3.3/Makefile.am ./Makefile.am
2 --- ../libecwj2-3.3/Makefile.am 2006-07-02 20:14:18.000000000 -0500
3 +++ ./Makefile.am 2009-03-16 14:04:13.000000000 -0500
5 +AUTOMAKE_OPTIONS = foreign
11 Source/include/gdt_pub.h \
12 Source/include/gdt_stat.h \
13 Source/include/pcs_erm.h \
14 - Source/C/NCSEcw/lcms/include/lcms.h \
15 - Source/C/NCSEcw/lcms/include/icc34.h \
16 Source/NCSBuildGnu/NCSGnuConfig.h
18 diff -Naur ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am ./Source/NCSBuildGnu/Makefile.am
19 --- ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am 2006-07-02 20:14:18.000000000 -0500
20 +++ ./Source/NCSBuildGnu/Makefile.am 2009-03-16 14:00:50.000000000 -0500
22 ../C/NCSEcw/shared_src/qmf_util.c \
23 ../C/NCSEcw/shared_src/quantize.c \
24 ../C/NCSEcw/shared_src/unpack.c \
25 - ../C/NCSEcw/lcms/src/cmscnvrt.c \
26 - ../C/NCSEcw/lcms/src/cmserr.c \
27 - ../C/NCSEcw/lcms/src/cmsgamma.c \
28 - ../C/NCSEcw/lcms/src/cmsgmt.c \
29 - ../C/NCSEcw/lcms/src/cmsintrp.c \
30 - ../C/NCSEcw/lcms/src/cmsio1.c \
31 - ../C/NCSEcw/lcms/src/cmslut.c \
32 - ../C/NCSEcw/lcms/src/cmsmatsh.c \
33 - ../C/NCSEcw/lcms/src/cmsmtrx.c \
34 - ../C/NCSEcw/lcms/src/cmsnamed.c \
35 - ../C/NCSEcw/lcms/src/cmspack.c \
36 - ../C/NCSEcw/lcms/src/cmspcs.c \
37 - ../C/NCSEcw/lcms/src/cmssamp.c \
38 - ../C/NCSEcw/lcms/src/cmsvirt.c \
39 - ../C/NCSEcw/lcms/src/cmswtpnt.c \
40 - ../C/NCSEcw/lcms/src/cmsxform.c \
41 ../C/NCSGDT2/NCSGDTEpsg.cpp \
42 ../C/NCSGDT2/NCSGDTEPSGKey.cpp \
43 ../C/NCSGDT2/NCSGDTLocation.cpp
44 diff -Naur ../libecwj2-3.3/Source/include/NCSJPCDefs.h ./Source/include/NCSJPCDefs.h
45 --- ../libecwj2-3.3/Source/include/NCSJPCDefs.h 2006-07-02 20:15:24.000000000 -0500
46 +++ ./Source/include/NCSJPCDefs.h 2009-03-16 14:00:27.000000000 -0500
48 // Use LCMS for ICC->RGB conversions, supports both
49 // restricted and full ICC profiles.
51 -#define NCSJPC_USE_LCMS
52 +//#define NCSJPC_USE_LCMS
55 // Use TinyXML for XML DOM Parsing
56 diff -Naur ../libecwj2-3.3/configure.in ./configure.in
57 --- ../libecwj2-3.3/configure.in 2006-07-02 20:13:30.000000000 -0500
58 +++ ./configure.in 2009-03-16 14:00:14.000000000 -0500
60 # Build some standard absolute include paths for the build
62 MAIN_INCLUDE_DIR="$PWD/Source/include"
63 -LCMS_INCLUDE_DIR="$PWD/Source/C/NCSEcw/lcms/include"
65 -# Run configure in the LCMS directory (using LCMS's own configure script)
66 -# to initialise any platform dependent settings that it uses
67 -# (e.g. typedefs for int types)
70 -cd Source/C/NCSEcw/lcms
75 # Build LIBECWJ2_DEFS with all defines, and NCSGnuSystemDefs.h with defines
76 # needed by apps building against libecwj2.
78 LIBECWJ2_CFLAGS="$PLATFORM_CFLAGS"
79 LIBECWJ2_STATIC_LDFLAGS="$PLATFORM_STATIC_LDFLAGS"
80 LIBECWJ2_SHARED_LDFLAGS="$PLATFORM_SHARED_LDFLAGS"
81 -LIBECWJ2_INCLUDES="-I$MAIN_INCLUDE_DIR -I$LCMS_INCLUDE_DIR"
82 +LIBECWJ2_INCLUDES="-I$MAIN_INCLUDE_DIR"
84 rm -f Source/NCSBuildGnu/NCSGnuSystemDefs.h
85 echo "#ifndef LIBECWJ2" > Source/NCSBuildGnu/NCSGnuSystemDefs.h