X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile;h=e28a8765518c7a858eedbaaf119a6a6c9bfd12cf;hb=51b61705e90b352de08519835fa1c63b81bca616;hp=1d4bade6b0fe4436e93c2c8718afab6d02a72fc3;hpb=88af35455d7d4b056766880c5d3a3b5a7340bd8b;p=gdcm.git

diff --git a/src/Makefile b/src/Makefile
index 1d4bade6..e28a8765 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 
 ###CC   = gcc
 ###LINK = gcc -shared -o ptinpoly.so
-SWIG = ~/Local/bin/swig
+SWIG = swig
 SWIGFLAGS= -python -c++
 
 PYTHON=python
@@ -9,19 +9,34 @@ PYTHON_PREFIX  =`$(PYTHON) -c "import sys; print sys.exec_prefix"`
 PYTHON_VERSION =`$(PYTHON) -c "import sys; print sys.version[:3]"`
 PYTHON_INCLUDES="-I$(PYTHON_PREFIX)/include/python$(PYTHON_VERSION)"
 
-CXXFLAGS=$(PYTHON_INCLUDES)
+CXXFLAGS=`glib-config --cflags`
+CPPFLAGS=-g -Wall -Wunused-variable
+LDFLAGS=`glib-config --libs` -g
 
-%.o : %.cxx
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+%_wrap.o : %_wrap.cxx
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(PYTHON_INCLUDES) $< -o $@
 %_wrap.cxx : %.i
 	$(SWIG) $(SWIGFLAGS) $(PYTHON_INCLUDES) -o $@ $<
+%.o : %.cxx
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+
+all: gdcmlib.so
 
-all: gdcmHeader.o dcm_wrap.o
+gdcmlib.so: gdcmUtil.o    \
+	gdcmHeader.o    \
+	gdcmElValue.o   \
+	gdcmDictEntry.o \
+	gdcmDict.o      \
+	gdcmDictSet.o   \
+	gdcmElValSet.o  \
+	gdcmHeaderIdo.o \
+	gdcmFile.o
+	g++ -shared -o gdcmlib.so $^ $(LDFLAGS)
 
-test: gdcmHeader.o
+python: gdcmlib.so gdcm_wrap.o
+	g++ -shared $^ -o _gdcm.so
 
 clean:
-	rm -f *_wrap* *.so *.o *.pyc
+	rm -f *_wrap* *.so *.o *.pyc gdcm.py
 
 .SECONDARY: dcm_wrap.cxx
-