* hashtest.cxx removed (since allready in Test)

      * src/gdcmlib.h renamed to src/gdcm.h
      * src/dcm.i renamed to src/gdcm.i
      * src/Makefile prepared for python wrapping  --- Frog

diff --git a/ChangeLog b/ChangeLog
index b75631af15708cf67f434cbb7c88858d8ab01a66..9820dfc8c136cd973e401c0d76154f54ac57f74f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-29 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+      * hashtest.cxx removed (since allready in Test)
+      * src/gdcmlib.h renamed to src/gdcm.h
+      * src/dcm.i renamed to src/gdcm.i
+      * src/Makefile prepared for python wrapping
+
 2002-10-29 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * src/gdcmHeader.cxx :
         - Parsing of header is now separated from loading of element values

diff --git a/hashtest.cxx b/hashtest.cxx
deleted file mode 100644 (file)
index 860db2f..0000000
--- a/hashtest.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <map>
-#include <string>
-#include <iostream>
-
-int main()
-{
-  typedef map<string, char*> dict;
-  
-  dict current;
-  current["00100010"] = "Patient Name";
-  current["7fe00010"] = "Pixel Data";
-  current["50000010"] = "Number of points";
-  current["00380010"] = "Admission ID";
-
-       cout << "Traversal of dictionary (note the proper ordering on key)." << endl;
-       for ( dict::iterator im = current.begin(); im != current.end(); ++im )
-               cout << "   \"" << im->first << "\" = " << im->second << endl;
-       cout << "End of dictionary." << endl;
-
-       cout << "Find request on key 00380010" << endl;
-       dict::iterator im = current.find("00380010");
-       cout << "   \"" << im->first << "\" = " << im->second << endl;
-}

diff --git a/src/Makefile b/src/Makefile
index 914983df25d47b49611a2de9509f10ba310a21a3..f929fc2d7fbcbf0ad2b5efb56213ffaaa747a002 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,9 @@ LDFLAGS=`glib-config --libs` -g
 %_wrap.cxx : %.i
        $(SWIG) $(SWIGFLAGS) $(PYTHON_INCLUDES) -o $@ $<
 
-all: gdcmUtil.o    \
+all: gdcmlib.so
+
+gdcmlib.so: gdcmUtil.o    \
        gdcmHeader.o    \
        gdcmElValue.o   \
        gdcmDictEntry.o \
@@ -28,7 +30,8 @@ all: gdcmUtil.o    \
        gdcmHeaderIdo.o
        g++ -shared -o gdcmlib.so $^ $(LDFLAGS)
 
-test: gdcmHeader.o
+python: gdcmlib.so dcm_wrap.o
+       g++ -shared $^ -o gdcmc.so
 
 clean:
        rm -f *_wrap* *.so *.o *.pyc

diff --git a/src/gdcmlib.h b/src/gdcm.h
similarity index 100%
rename from src/gdcmlib.h
rename to src/gdcm.h

diff --git a/src/dcm.i b/src/gdcm.i
similarity index 100%
rename from src/dcm.i
rename to src/gdcm.i

diff --git a/src/test.cxx b/src/test.cxx
deleted file mode 100644 (file)
index fca0a86..0000000
--- a/src/test.cxx
+++ /dev/null
@@ -1 +0,0 @@
-#include "dcmlib.h"