Updated Makefile

swig/Makefile

@@ -16,39 +16,61 @@ ANTLRLIB=/usr/lib/libantlr-pic.a
 CPPFLAGS=-fPIC -O2
 
 # CBIN=libcorpustag.o libcorpustagset.o libcorpustagsetmanager.o libcclparser.o
-# CBIN=libcclvalue.o libcclbool.o libcclposition.o libccltset.o libcclstrset.o
+# CBIN=libcclvalue.o libcclbool.o libcclmatch.o libcclposition.o libccltset.o libcclstrset.o
 # CBIN=libcclexpression.o libcclparsedexpression.o
-CBIN=libcclfunctionaloperator.o
+CBIN=libcclvariables.o libcclparsedexpression.o 
+
+#CBIN=boost_shared_ptr.o \
+	libcorpustag.o libcorpustagset.o libcorpustagsetmanager.o \
+	libcclvalue.o libcclstrset.o libcclbool.o libcclmatch.o libcclposition.o \
+	libccltset.o libcclexpression.o libcclparsedexpression.o \
+	libcclfunctionaloperator.o libcclvariables.o 
 
 CBINOUT=_libcorpustag.so _libcorpustagset.so _libcorpustagsetmanager.so \
 	_libcclvalue.so _libcclstrset.so _libcclbool.so _libcclposition.so \
 	_libccltset.so _libcclexpression.so _libcclparsedexpression.so \
-	_libcclfunctionaloperator.so
+	_libcclfunctionaloperator.so _libcclvariables.so _libcclmatch.so \
+	_boost_shared_ptr.so
 
 CWRAP=libcorpustag_wrap.cxx libcorpustagset_wrap.cxx libcorpustagsetmanager_wrap.cxx \
 	libcclvalue_wrap.cxx libcclstrset_wrap.cxx libcclbool_wrap.cxx \
 	libcclparser_wrap.cxx libcclposition_wrap.cxx libccltset_wrap.cxx \
 	libcclexpression_wrap.cxx libcclparsedexpression_wrap.cxx \
-	libcclfunctionaloperator_wrap.cxx
+	libcclfunctionaloperator_wrap.cxx libcclvariables_wrap.cxx libcclmatch_wrap.cxx \
+	boost_shared_ptr_wrap.cxx
 
 CWRAPBIN=libcorpustag_wrap.o libcorpustagset_wrap.o libcorpustagsetmanager_wrap.o \
 				 libcclvalue_wrap.o libcclstrset_wrap.o libcclbool_wrap.o \
 				 libcclposition_wrap.o libccltset_wrap.o \
 				 libcclexpression_wrap.o libcclparsedexpression_wrap.o \
-				 libcclfunctionaloperator_wrap.o
+				 libcclfunctionaloperator_wrap.o libcclvariables_wrap.o \
+				 libcclmatch_wrap.o boost_shared_ptr_wrap.o
 
 PYMODULES=libcorpustag.py libcorpustagset.py libcorpustagsetmanager.py \
 	libcclvalue.py libcclstrset.py libcclbool.py \
 	libcclparser.py libcclposition.py libccltset.py \
-	libcclexpression.py libcclparsedexpression.py
+	libcclexpression.py libcclparsedexpression.py libcclvariables.py \
+	boost_shared_ptr.py
 
 PYCBIN=libcorpustag.pyc libcorpustagset.pyc libcorpustagsetmanager.pyc \
 	 libcclvalue.pyc libcclstrset.pyc libcclbool.pyc \
-	 libcclposition.pyc libccltset.pyc libcclexpression.pyc libcclparsedexpression.pyc
+	 libcclposition.pyc libccltset.pyc libcclexpression.pyc libcclparsedexpression.pyc \
+	 libcclvariables.pyc boost_shared_ptr.pyc
 
-all:$(CBIN)
+all:boost_shared_ptr.o $(CBIN)
 	# Nothing to do
 
+# -----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+#  boost::shared_ptr wrappers
+# -----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+# shared_ptr
+boost_shared_ptr.o:
+	$(SWIG) $(SWIGOPTS_LANG) boost_shared_ptr.i
+	$(CPP) -c boost_shared_ptr_wrap.cxx -I$(PYTHONDIR) $(CPPFLAGS)
+	$(CPP) -shared boost_shared_ptr_wrap.o -o _boost_shared_ptr.so
+
 
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
@@ -116,6 +138,13 @@ libcclstrset.o:
 	$(CPP) -shared libcclstrset_wrap.o \
 		$(CCLBIN) $(ANTLRLIB) -o _libcclstrset.so
 
+# match
+libcclmatch.o:
+	$(SWIG) $(SWIGOPTS_LANG) libcclmatch.i
+	$(CPP) -c libcclmatch_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
+	$(CPP) -shared libcclmatch_wrap.o \
+		$(CCLBIN) $(ANTLRLIB) -o _libcclmatch.so
+
 # Expression
 libcclexpression.o:
 	$(SWIG) $(SWIGOPTS_LANG) libcclexpression.i
@@ -137,6 +166,14 @@ libcclfunctionaloperator.o:
 	$(CPP) -shared libcclfunctionaloperator_wrap.o \
 		$(CCLBIN) $(ANTLRLIB) -o _libcclfunctionaloperator.so
 
+# Variables
+libcclvariables.o:
+	$(SWIG) $(SWIGOPTS_LANG) libcclvariables.i
+	$(CPP) -c libcclvariables_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
+	$(CPP) -shared libcclvariables_wrap.o \
+		$(CCLBIN) $(ANTLRLIB) -o _libcclvariables.so
+
+
 # -----------------------------------------------------------------------------
 clean:
 	rm -f $(CBIN) $(CBINOUT) $(CWRAP) $(CWRAPBIN) $(PYMODULES) $(PYCBIN)