Replace confusing names gdcmImage, etc by gdcmDicomDirImage etc, to avoid

[gdcm.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c60798f57483fb0cd58360037e50398dea842506..26911da7a79a25f8af40d03541e3046ac82eb71c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,44 +9,63 @@ 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    \
-       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      \
-       gdcmJpegIdo.cxx
+   $(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        \
-       gdcmTS.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
+