COMP: Remove empty file (need VERIFY or DISPLAY). Also fix makefile to produce exactl...

diff --git a/src/gdcmmpeg2/src/CMakeLists.txt b/src/gdcmmpeg2/src/CMakeLists.txt
index 3603e553272b5fe10abeed3a3b5c98bdfb4e620a..109e53d1324ac95a5ac19d0a2eac61e976d141ac 100644 (file)
--- a/src/gdcmmpeg2/src/CMakeLists.txt
+++ b/src/gdcmmpeg2/src/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS(mpeg2dec)
+SUBDIRS(mpeg2dec mpeg2enc)

diff --git a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
index 5777c3d41aa58c09148c34a5c40b1316e571c395..dc1f63d8bc0cedf54cd8ee7320fefe3c4a0eacd6 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
+++ b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(GDCM_MPEG2_SOURCES
+SET(GDCM_MPEG2DEC_SOURCES
   getpic.c
   motion.c
   getvlc.c
@@ -10,15 +10,15 @@ SET(GDCM_MPEG2_SOURCES
   spatscal.c
   idct.c
   idctref.c
-  display.c
+  #  display.c
   systems.c
   subspic.c
-  verify.c
+  #  verify.c
   )
-ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2_SOURCES} )
+ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2DEC_SOURCES} )
 IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcmmpeg2 -lm)
 ENDIF(UNIX)
 
-ADD_EXECUTABLE(mpeg2dec mpeg2dec.c)
-TARGET_LINK_LIBRARIES(mpeg2dec gdcmmpeg2)
+ADD_EXECUTABLE(mpeg2decode mpeg2dec.c)
+TARGET_LINK_LIBRARIES(mpeg2decode gdcmmpeg2)

diff --git a/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt b/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt
index ee3f876b62f7e8af12a383369666c44617ebd717..c560ead919e91aac173fdc9435fd900e48c607ec 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt
+++ b/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt
@@ -22,5 +22,5 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcmmpeg2enc -lm)
 ENDIF(UNIX)
 
-ADD_EXECUTABLE(mpeg2enc mpeg2enc.c)
-TARGET_LINK_LIBRARIES(mpeg2enc gdcmmpeg2enc)
+ADD_EXECUTABLE(mpeg2encode mpeg2enc.c)
+TARGET_LINK_LIBRARIES(mpeg2encode gdcmmpeg2enc)