ENH: Fix a shadow variable

[gdcm.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ec064d88d81dc160a580f9f0f5af244495483a71..8b4d3a1bdd889883e22c07911b163f5e18340c10 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,39 +1,75 @@
-#
-# 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/\"
-
-libgdcm_la_SOURCES=            \
-       gdcmException.cxx       \
-       gdcmUtil.cxx            \
-       gdcmHeader.cxx    \
-       gdcmElValue.cxx   \
-       gdcmDictEntry.cxx \
-       gdcmDict.cxx      \
-       gdcmDictSet.cxx   \
-       gdcmElValSet.cxx  \
-       gdcmHeaderIdo.cxx \
-       gdcmFile.cxx    \
-       gdcmJpeg.cxx
+CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
+           -D__STDC_LIMIT_MACROS  # Refer to stdint.h
+
+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=                \
+   gdcmDebug.cxx                   \
+   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                    \
+   gdcmGlobal.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 =       \
-       config.h        \
-       gdcm.h          \
-       gdcmException.h \
-       gdcmIdo.h       \
-       gdcmUtil.h      \
-       iddcmjpeg.h
+libgdcminclude_HEADERS =           \
+   gdcmCommon.h                    \
+   gdcmDebug.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                      \
+   gdcmGlobal.h                    \
+   gdcm.h                          \
+   gdcmHeaderEntry.h               \
+   gdcmHeader.h                    \
+   gdcmHeaderHelper.h              \
+   gdcmObject.h                    \
+   gdcmParser.h                    \
+   gdcmVR.h                        \
+   gdcmTS.h
+
+EXTRA_DIST =   \
+       gdcmUtil.h
+