changed the directory hierarchy of the whole project. See README files for details.

3 files changed, 6 insertions, 73 deletions

diff --git a/libopenjpeg/jpwl/CMakeLists.txt b/libopenjpeg/jpwl/CMakeLists.txt
index 7dbb3d68..52411779 100755
--- a/libopenjpeg/jpwl/CMakeLists.txt
+++ b/libopenjpeg/jpwl/CMakeLists.txt
@@ -2,33 +2,11 @@
 
 ADD_DEFINITIONS(-DUSE_JPWL)
 
-SET(OPJ_SRCS
-../libopenjpeg/bio.c
-../libopenjpeg/cio.c
-../libopenjpeg/dwt.c
-../libopenjpeg/event.c
-../libopenjpeg/image.c
-../libopenjpeg/j2k.c
-../libopenjpeg/j2k_lib.c
-../libopenjpeg/jp2.c
-../libopenjpeg/jpt.c
-../libopenjpeg/mct.c
-../libopenjpeg/mqc.c
-../libopenjpeg/openjpeg.c
-../libopenjpeg/pi.c
-../libopenjpeg/raw.c
-../libopenjpeg/t1.c
-../libopenjpeg/t2.c
-../libopenjpeg/tcd.c
-../libopenjpeg/tgt.c
-)
 SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
 
-SET(common_SRCS "")
-# If not getopt was found then add it to the lib:
-IF(DONT_HAVE_GETOPT)
-  SET(common_SRCS ${OPENJPEG_SOURCE_DIR}/common/getopt.c)
-ENDIF(DONT_HAVE_GETOPT)
+INCLUDE_DIRECTORIES(
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  )
 
 # Build the library
 IF(WIN32)
@@ -38,7 +16,7 @@ IF(WIN32)
     ADD_DEFINITIONS(-DOPJ_STATIC)
   ENDIF(BUILD_SHARED_LIBS)
 ENDIF(WIN32)
-ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPJ_SRCS})
+ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL 
   PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
 
@@ -46,48 +24,3 @@ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
   DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
 )
-
-# Build executables
-
-INCLUDE_DIRECTORIES(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  ${OPENJPEG_SOURCE_DIR}/common
-  ${ZLIB_INCLUDE_DIRNAME}
-  ${LCMS_INCLUDE_DIRNAME}
-  ${PNG_INCLUDE_DIRNAME}
-  ${TIFF_INCLUDE_DIRNAME}
-  )
-
-ADD_EXECUTABLE(JPWL_j2k_to_image
-../codec/j2k_to_image.c
-../codec/convert.c
-../codec/index.c
-${OPENJPEG_SOURCE_DIR}/common/color.c
-${common_SRCS}
-)
-
-TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL
-  ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-#
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m)
-ENDIF(UNIX)
-
-
-ADD_EXECUTABLE(JPWL_image_to_j2k
-../codec/convert.c
-../codec/index.c
-../codec/image_to_j2k.c
-${common_SRCS}
-)
-
-TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL 
-	${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-#
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m)
-ENDIF(UNIX)
-
-INSTALL(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image
-  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Binaries
-)
diff --git a/libopenjpeg/jpwl/jpwl.c b/libopenjpeg/jpwl/jpwl.c
index 42c88718..8a876683 100644
--- a/libopenjpeg/jpwl/jpwl.c
+++ b/libopenjpeg/jpwl/jpwl.c
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.

  */

 

-#include "../libopenjpeg/opj_includes.h"

+#include "opj_includes.h"

 

 #ifdef USE_JPWL

 

diff --git a/libopenjpeg/jpwl/jpwl_lib.c b/libopenjpeg/jpwl/jpwl_lib.c
index ea53c935..048a7345 100644
--- a/libopenjpeg/jpwl/jpwl_lib.c
+++ b/libopenjpeg/jpwl/jpwl_lib.c
@@ -31,7 +31,7 @@
 
 #ifdef USE_JPWL
 
-#include "../libopenjpeg/opj_includes.h"
+#include "opj_includes.h"
 #include <limits.h>
 
 /** Minimum and maximum values for the double->pfp conversion */