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

diff --git a/src/Makefile.am b/src/Makefile.am
index d610a8d6..ade41d50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,14 @@
-#
-# 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
 
 lib_LTLIBRARIES = libgdcm.la
 
-CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\"
+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	\
@@ -27,22 +21,27 @@ libgdcm_la_SOURCES=		\
 	gdcmElValSet.cxx  \
 	gdcmHeaderIdo.cxx \
 	gdcmFile.cxx	\
-	gdcmJpeg.cxx
+	gdcmVR.cxx	\
+	gdcmTS.cxx	\
+	gdcmJpeg.cxx	\
+	gdcmJpegIdo.cxx
 
 libgdcmincludedir = $(includedir)
 libgdcminclude_HEADERS = \
 	gdcmException.h	\
-	gdcmHeader.h  	\
-	gdcmFile.h
-
-EXTRA_DIST = \
-	gdcmUtil.h	\
-	gdcm.h  	\
-	gdcmIdo.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