X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FMakefile.am;h=263adbb8942671ab214e5ad2d8f4e83c4feee723;hb=f8273351d460d9f04206e149febc8d1cc7af3fde;hp=ade41d50164bc2673df769c1ca8c15247e4cfc09;hpb=a26e6f06a76ec85504cf65288e7c47f2cd728641;p=gdcm.git

diff --git a/src/Makefile.am b/src/Makefile.am
index ade41d50..263adbb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,40 +8,44 @@ CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
            -D__STDC_LIMIT_MACROS  # Refer to stdint.h
 
 libgdcm_la_LIBADD = \
-   $(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	\
-	gdcmJpegIdo.cxx
+   $(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                  \
+   gdcmHeader2.cxx	            \
+   gdcmHeaderHelper.cxx		\
+   gdcmHeaderEntry.cxx		\
+   gdcmDictEntry.cxx               \
+   gdcmDict.cxx                    \
+   gdcmDictSet.cxx			\
+   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	\
+libgdcminclude_HEADERS =                \
+	gdcmException.h                 \
+	gdcmHeader.h                    \
+	gdcmHeaderHelper.h              \
+	gdcmCommon.h                    \
+	gdcm.h                          \
+	gdcmDictSet.h                   \
+	gdcmDict.h                      \
+	gdcmDictEntry.h                 \
+	gdcmHeaderEntry.h               \
+	gdcmVR.h                        \
+	gdcmTS.h                        \
 	gdcmFile.h
 
-EXTRA_DIST = \
-	gdcmUtil.h	\
-	gdcmIdo.h  	\
-	iddcmjpeg.h
+EXTRA_DIST =   \
+	gdcmUtil.h      
+