removal of now useless LibIDO Jpeg Lossless .h and .cxx

[gdcm.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a4e04c598baf7c93e4c00a91146bc87b9e3ae8c2..f073d71b8dc8aa5226c44e7f7a2a71fd79c0c7dd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,4 @@
-#
-# Targets
-#
-
-# Before making a release, the LTVERSION string should be modified.
-# The string is of the form C:R:A.
-# - If interfaces have been changed or added, but binary compatibility has
-#   been preserved, change to C+1:0:A+1
-# - If binary compatibility has been broken (eg removed or changed interfaces)
-#   change to C+1:0:0
-# - If the interface is the same as the previous version, change to C:R+1:A
+SUBDIRS = jpeg
 
 LTVERSION = 0:1:0
 
@@ -17,95 +7,47 @@ lib_LTLIBRARIES = libgdcm.la
 CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
            -D__STDC_LIMIT_MACROS  # Refer to stdint.h
 
+libgdcm_la_LIBADD = \
+   $(top_builddir)/src/jpeg/libijg12/libgdcmijpeg12.la  \
+   $(top_builddir)/src/jpeg/libijg8/libgdcmijpeg8.la    \
+   $(top_builddir)/src/jpeg/ljpg/libgdcmjpg.la 
+
 libgdcm_la_SOURCES=            \
        gdcmException.cxx       \
        gdcmUtil.cxx            \
        gdcmHeader.cxx    \
+       gdcmHeaderHelper.cxx    \
        gdcmElValue.cxx   \
        gdcmDictEntry.cxx \
        gdcmDict.cxx      \
        gdcmDictSet.cxx   \
        gdcmElValSet.cxx  \
        gdcmHeaderIdo.cxx \
-       gdcmFile.cxx    \
-       gdcmVR.cxx      \
-       gdcmTS.cxx      \
-       gdcmJpeg.cxx    \
-       gdcmJpegIdo.cxx \
-jcapimin.c \
-jcapistd.c \
-jctrans.c \
-jcparam.c \
-jdatadst.c \
-jcinit.c \
-jcmaster.c \
-jcmarker.c \
-jcmainct.c \
-jcprepct.c \
-jccoefct.c \
-jccolor.c \
-jcsample.c \
-jchuff.c \
-jcphuff.c \
-jcdctmgr.c \
-jfdctfst.c \
-jfdctflt.c \
-jfdctint.c \
-jdapimin.c \
-jdapistd.c \
-jdtrans.c \
-jdatasrc.c \
-jdmaster.c \
-jdinput.c \
-jdmarker.c \
-jdhuff.c \
-jdphuff.c \
-jdmainct.c \
-jdcoefct.c \
-jdpostct.c \
-jddctmgr.c \
-jidctfst.c \
-jidctflt.c \
-jidctint.c \
-jidctred.c \
-jdsample.c \
-jdcolor.c \
-jquant1.c \
-jquant2.c \
-jdmerge.c \
-jcomapi.c \
-jutils.c \
-jerror.c \
-jmemmgr.c \
-jmemnobs.c
+       gdcmFile.cxx     \
+       gdcmVR.cxx       \
+       gdcmTS.cxx       \
+       gdcmJpeg.cxx     \
+       gdcmJpeg12.cxx   \
+       gdcmJpeg2000.cxx \
+       gdcmRLE.cxx      \
+        gdcmParse.cxx
 
 libgdcmincludedir = $(includedir)
-libgdcminclude_HEADERS = \
-       gdcmException.h \
-       gdcmHeader.h    \
-       gdcmCommon.h    \
-       gdcm.h          \
-       gdcmDictSet.h   \
-       gdcmDict.h      \
-       gdcmDictEntry.h \
-       gdcmElValue.h   \
-       gdcmElValSet.h  \
-       gdcmVR.h        \
-       gdcmTS.h        \
-       gdcmFile.h \
-jchuff.h  \
-jconfig.h  \
-jdct.h  \
-jdhuff.h  \
-jerror.h  \
-jinclude.h  \
-jmemsys.h  \
-jmorecfg.h  \
-jpegint.h  \
-jpeglib.h  \
-jversion.h
+libgdcminclude_HEADERS =   \
+       gdcmException.h    \
+       gdcmHeader.h       \
+       gdcmHeaderHelper.h \
+       gdcmCommon.h       \
+       gdcm.h             \
+       gdcmDictSet.h      \
+       gdcmDict.h         \
+       gdcmDictEntry.h    \
+       gdcmElValue.h      \
+       gdcmElValSet.h     \
+       gdcmVR.h           \
+       gdcmTS.h           \
+       gdcmFile.h
+
+EXTRA_DIST =            \
+       gdcmUtil.h      
 
-EXTRA_DIST = \
-       gdcmUtil.h      \
-       gdcmIdo.h       \
-       iddcmjpeg.h