Latest stage of the C&C SVN (2614M).

.gitignore

@@ -4,7 +4,7 @@
 # Compiled Object files
 *.slo
 *.lo
-*.o
+# *.o
 *.obj
 
 # Precompiled Headers
@@ -28,5 +28,5 @@
 
 # Executables
 *.exe
-*.out
+# *.out
 *.app

candc/Makefile

@@ -0,0 +1,52 @@
+# -*- Mode: Makefile; -*-
+# C&C NLP tools
+# Copyright (c) Universities of Edinburgh, Oxford and Sydney
+# Copyright (c) James R. Curran
+#
+# This software is covered by a non-commercial use licence.
+# See LICENCE.txt for the full text of the licence.
+#
+# If LICENCE.txt is not included in this distribution
+# please email candc@it.usyd.edu.au to obtain a copy.
+
+PORT = unix
+PORT_OBJS = src/lib/ports/unix.o src/lib/ports/unix_common.o src/lib/ports/colour.o
+
+CC = gcc
+CFLAGS = -W -Wall -Wextra -fPIC -O3 $(INC)
+
+CXX = g++
+CXXFLAGS = $(CFLAGS)
+
+LD=$(CXX)
+LDFLAGS = -fPIC
+DEPEND = $(CC) $(INC)
+
+INC = -Isrc/include -isystem ext/include
+LIBS = -Llib -lm -Lext/lib
+
+SOAP_INC = $(INC)
+SOAP_LIBS = $(LIBS) -lgsoap++
+SOAP_CPP = ext/bin/soapcpp2
+SOAP_CXXFLAGS = $(CXXFLAGS) $(SOAP_INC)
+SOAP_LDFLAGS = $(LDFLAGS)
+
+PYTHON = python2.7
+
+SHAREDLIB = so
+LIB_LDFLAGS = -shared $(LDFLAGS)
+
+PY_INC = -isystem ext/include -isystem /usr/include/$(PYTHON)
+PY_LIBS = $(LIBS) -lcandc -Lext/lib -lboost_python
+PY_CXXFLAGS = $(CXXFLAGS) $(PY_INC)
+PY_LDFLAGS = -shared $(LDFLAGS)
+
+MPIXX = /usr/bin/mpicxx
+MPI_CXXFLAGS = $(CXXFLAGS) -DMPICH_IGNORE_CXX_SEEK
+MPI_LIBS = $(LIBS) -lboost_mpi -lboost_serialization -lmrmpi
+
+LEX = flex
+
+PROLOG = swipl
+
+include Makefile.targets

candc/Makefile.macosx

@@ -13,7 +13,7 @@ PORT = macosx
 PORT_OBJS = src/lib/ports/bsd.o src/lib/ports/unix_common.o src/lib/ports/colour.o
 
 CC = gcc
-CFLAGS = -Wall -O3 -fno-common $(INC)
+CFLAGS = -Wall -Wextra -O3 -fno-common $(INC)
 
 CXX = g++
 CXXFLAGS = $(CFLAGS)
@@ -31,13 +31,13 @@ SOAP_CPP = ext/bin/soapcpp2
 SOAP_CXXFLAGS = $(CXXFLAGS) $(SOAP_INC)
 SOAP_LDFLAGS = $(LDFLAGS)
 
-PYTHON = python2.4
+PYTHON = python2.6
 
 SHAREDLIB = dylib
 LIB_LDFLAGS = -dynamiclib $(LDFLAGS)
 
-PY_INC = -Iext/include -I/Library/Frameworks/Python.framework/Versions/Current/include/python2.4
-PY_LIBS = $(LIBS) -lcandc -Lext/lib -lboost_python-1_33_1 -framework Python
+PY_INC = -Iext/include -I/Library/Frameworks/Python.framework/Versions/Current/include/$(PYTHON)
+PY_LIBS = $(LIBS) -lcandc -Lext/lib -lboost_python -framework Python
 PY_CXXFLAGS = $(CXXFLAGS) -fPIC $(PY_INC)
 PY_LDFLAGS = -bundle $(LDFLAGS)
 

candc/Makefile.sunos

@@ -45,6 +45,6 @@ MPIXX = mpicxx
 
 LEX = flex
 
-PROLOG = pl
+PROLOG = swipl
 
 include Makefile.targets