X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FMakefile.am;h=8b4d3a1bdd889883e22c07911b163f5e18340c10;hb=7815fe9dc3532b716dc478ca0f255263f99d296f;hp=6c1881ad974a1f22f005580238f3ec7685f189dd;hpb=48d629b49cc690bcd26f6721f38af0ca876be417;p=gdcm.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 6c1881ad..8b4d3a1b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,47 +9,67 @@ CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
 
 libgdcm_la_LIBADD = \
    $(top_builddir)/src/jpeg/libijg12/libgdcmijpeg12.la  \
-   $(top_builddir)/src/jpeg/libijg8/libgdcmijpeg8.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	 \
-	gdcmJpeg12.cxx	 \
-	gdcmJpeg2000.cxx \
-	gdcmRLE.cxx      \
-        gdcmParse.cxx    \
-	gdcmJpegIdo.cxx
+   $(top_builddir)/src/jpeg/libijg8/libgdcmijpeg8.la    \
+   $(top_builddir)/src/jpeg/ljpg/libgdcmjpg.la
+
+libgdcm_la_SOURCES=                \
+   gdcmDebug.cxx                   \
+   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                    \
+   gdcmGlobal.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	   \
-	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      \
-	gdcmIdo.h       \
-	iddcmjpeg.h
+libgdcminclude_HEADERS =           \
+   gdcmCommon.h                    \
+   gdcmDebug.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                      \
+   gdcmGlobal.h                    \
+   gdcm.h                          \
+   gdcmHeaderEntry.h               \
+   gdcmHeader.h                    \
+   gdcmHeaderHelper.h              \
+   gdcmObject.h                    \
+   gdcmParser.h                    \
+   gdcmVR.h                        \
+   gdcmTS.h
+
+EXTRA_DIST =   \
+	gdcmUtil.h
+