X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=26911da7a79a25f8af40d03541e3046ac82eb71c;hb=c8d390d6a732aa48eeb9d831ea83f4bebc8e19f8;hp=fc59601e4755b8fb984b7d61e77b1a9f58b4b5db;hpb=bc3e7a63638ffb3aa7460bf579ae65002ac6770c;p=gdcm.git

diff --git a/src/Makefile.am b/src/Makefile.am
index fc59601e..26911da7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-&SUBDIRS = jpeg
+SUBDIRS = jpeg
 
 LTVERSION = 0:1:0
 
@@ -10,11 +10,16 @@ CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
 libgdcm_la_LIBADD = \
    $(top_builddir)/src/jpeg/libijg12/libgdcmijpeg12.la  \
    $(top_builddir)/src/jpeg/libijg8/libgdcmijpeg8.la    \
-   $(top_builddir)/src/jpeg/ljpg/libgdcmjpg.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                 \
@@ -24,18 +29,13 @@ libgdcm_la_SOURCES=                \
    gdcmHeader.cxx                  \
    gdcmHeaderEntry.cxx             \
    gdcmHeaderHelper.cxx            \
-   gdcmImage.cxx                   \
-   gdcmMeta.cxx                    \
    gdcmJpeg12.cxx                  \
    gdcmJpeg2000.cxx                \
    gdcmJpeg.cxx                    \
    gdcmObject.cxx                  \
    gdcmParsePixels.cxx             \
    gdcmParser.cxx                  \
-   gdcmPatient.cxx                 \
    gdcmRLE.cxx                     \
-   gdcmSerie.cxx                   \
-   gdcmStudy.cxx                   \
    gdcmTS.cxx                      \
    gdcmUtil.cxx                    \
    gdcmVR.cxx
@@ -46,7 +46,12 @@ libgdcminclude_HEADERS =                \
 	gdcmCommon.h                    \
 	gdcmDicomDir.h                  \
         gdcmDicomDirElement.h           \
-	gdcmDictEntry.h                 \
+	gdcmDicomDirImage.h             \
+        gdcmDicomDirMeta.h              \
+	gdcmDicomDirPatient.h           \
+	gdcmDicomDirSerie.h             \
+	gdcmDicomDirStudy.h             \
+        gdcmDictEntry.h                 \
 	gdcmDict.h                      \
 	gdcmDictSet.h                   \
 	gdcmDirList.h                   \
@@ -56,17 +61,11 @@ libgdcminclude_HEADERS =                \
 	gdcmHeaderEntry.h               \
 	gdcmHeader.h                    \
 	gdcmHeaderHelper.h              \
-	gdcmImage.h                     \
-        gdcmMeta.h                      \
 	gdcmObject.h                    \
 	gdcmParser.h                    \
-	gdcmPatient.h                   \
-	gdcmSerie.h                     \
-	gdcmStudy.h                     \
 	gdcmVR.h                        \
 	gdcmTS.h
 
-
 EXTRA_DIST =   \
-	gdcmUtil.h      
+	gdcmUtil.h