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

diff --git a/src/Makefile.am b/src/Makefile.am
index c5506f18..263adbb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,37 +1,51 @@
-#
-# 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 = -DPUB_DICT_PATH=\"$(prefix)/dicts/\"
+CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
+           -D__STDC_LIMIT_MACROS  # Refer to stdint.h
 
-libgdcm_la_SOURCES=		\
-	gdcmException.cxx	\
-	gdcmUtil.cxx 		\
-	gdcmHeader.cxx    \
-	gdcmElValue.cxx   \
-	gdcmDictEntry.cxx \
-	gdcmDict.cxx      \
-	gdcmDictSet.cxx   \
-	gdcmElValSet.cxx  \
-	gdcmHeaderIdo.cxx \
-	gdcmFile.cxx
+libgdcm_la_LIBADD = \
+   $(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 = 	\
-	config.h	\
-	gdcm.h  	\
-	gdcmException.h	\
-	gdcmIdo.h  	\
-	gdcmUtil.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      
+