X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FMakefile.am;h=26911da7a79a25f8af40d03541e3046ac82eb71c;hb=22f785a2627d1e7823701193bd7624739a3e033b;hp=dcd328a2ea9d9aa5229734d4abe6bbe96f883216;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git

diff --git a/src/Makefile.am b/src/Makefile.am
index dcd328a2..26911da7 100644
--- 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,35 +7,65 @@ lib_LTLIBRARIES = libgdcm.la
 CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
            -D__STDC_LIMIT_MACROS  # Refer to stdint.h
 
-libgdcm_la_SOURCES=		\
-	gdcmException.cxx	\
-	gdcmUtil.cxx 		\
-	gdcmHeader.cxx    \
-	gdcmElValue.cxx   \
-	gdcmDictEntry.cxx \
-	gdcmDict.cxx      \
-	gdcmDictSet.cxx   \
-	gdcmElValSet.cxx  \
-	gdcmHeaderIdo.cxx \
-	gdcmFile.cxx	\
-	gdcmVR.cxx	\
-	gdcmJpeg.cxx
+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=                \
+   gdcmDicomDir.cxx                \
+   gdcmDicomDirElement.cxx         \
+   gdcmDicomDirImage.cxx           \
+   gdcmDicomDirMeta.cxx            \
+   gdcmDicomDirPatient.cxx         \
+   gdcmDicomDirSerie.cxx           \
+   gdcmDicomDirStudy.cxx           \
+   gdcmDict.cxx                    \
+   gdcmDictEntry.cxx               \
+   gdcmDictSet.cxx                 \
+   gdcmDirList.cxx                 \
+   gdcmException.cxx               \
+   gdcmFile.cxx                    \
+   gdcmHeader.cxx                  \
+   gdcmHeaderEntry.cxx             \
+   gdcmHeaderHelper.cxx            \
+   gdcmJpeg12.cxx                  \
+   gdcmJpeg2000.cxx                \
+   gdcmJpeg.cxx                    \
+   gdcmObject.cxx                  \
+   gdcmParsePixels.cxx             \
+   gdcmParser.cxx                  \
+   gdcmRLE.cxx                     \
+   gdcmTS.cxx                      \
+   gdcmUtil.cxx                    \
+   gdcmVR.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	\
-	gdcmFile.h
-
-EXTRA_DIST = \
-	gdcmUtil.h	\
-	gdcmIdo.h  	\
-	iddcmjpeg.h
+libgdcminclude_HEADERS =                \
+	gdcmCommon.h                    \
+	gdcmDicomDir.h                  \
+        gdcmDicomDirElement.h           \
+	gdcmDicomDirImage.h             \
+        gdcmDicomDirMeta.h              \
+	gdcmDicomDirPatient.h           \
+	gdcmDicomDirSerie.h             \
+	gdcmDicomDirStudy.h             \
+        gdcmDictEntry.h                 \
+	gdcmDict.h                      \
+	gdcmDictSet.h                   \
+	gdcmDirList.h                   \
+	gdcmException.h                 \
+	gdcmFile.h                      \
+	gdcm.h                          \
+	gdcmHeaderEntry.h               \
+	gdcmHeader.h                    \
+	gdcmHeaderHelper.h              \
+	gdcmObject.h                    \
+	gdcmParser.h                    \
+	gdcmVR.h                        \
+	gdcmTS.h
+
+EXTRA_DIST =   \
+	gdcmUtil.h
+