Bug 119: Except for the path of the .so file that is generated in src and is...

Bug 119: Except for the path of the .so file that is generated in src and is used and not found in test the files seem to be right.

MAC/APL/PAC/MatlabCal/configure.in

@@ -51,6 +51,7 @@ dnl
 dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
+lofar_MATLAB(/opt/MATLAB/MATLAB_Compiler_Runtime/v78)
 lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
 

MAC/APL/PAC/MatlabCal/src/Makefile.am

+
+AM_CPPFLAGS = -I$(top_builddir)/include
+
+MATLAB_COMPILER = mcc
+libMatlabCal.so: calibrate.m
+	$(MATLAB_COMPILER) -v -W cpplib:libMatlabCal -T link:lib $<
+
+EXTRA_DIST = 
+
+BUILT_SOURCES = libMatlabCal.so
+
+#pkgincludedir=$(includedir)/APL/CAL_Protocol
+#pkginclude_HEADERS = \ $(BUILT_SOURCES)
+
+clean-local:
+	rm -f *.ph
+
+include $(top_srcdir)/Makefile.common

MAC/APL/PAC/MatlabCal/test/Makefile.am

+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/test
+
+sbin_PROGRAMS = \
+	tCalibrate
+
+tCalibrate_SOURCES 	= $(BUILT_SOURCES) tCalibrate.cc
+tCalibrate_LDADD	= -lMatlabCal -L../src/ $(LOFAR_DEPEND)
+tCalibrate_DEPENDENCIES	= $(LOFAR_DEPEND)
+
+BUILT_SOURCES = 
+
+EXTRA_DIST = $(BUILT_SOURCES)
+
+sysconf_DATA = 
+
+include $(top_srcdir)/Makefile.common

MAC/APL/PAC/MatlabCal/test/testdriver.cc → MAC/APL/PAC/MatlabCal/test/tCalibrate.cc

-#include "libstatcal1_0.h"
+#include <libMatlabCal.h>
 #include <iostream>
 #include <fstream>
 #include <iterator>
@@ -13,12 +13,12 @@ int driver(int argc, char **argv)
 	cerr << "Failed to initialize the MCR" << endl;
 	return -1;
     }
-    if (!libstatcal1_0Initialize())
+    if (!libMatlabCalInitialize())
     {
-	cerr << "Failed to initialize libstatcal1_0.s0" << endl;
+	cerr << "Failed to initialize libMatlabCal.s0" << endl;
 	return -2;
     }
-    cout << "MCR and libstatcal1_0.so successfully initialized" << endl;
+    cout << "MCR and libMatlabCal.so successfully initialized" << endl;
 
 
     try
@@ -102,7 +102,7 @@ int driver(int argc, char **argv)
 	return -4;
     }
 
-    libstatcal1_0Terminate();
+    libMatlabCalTerminate();
     mclTerminateApplication();
     cout << "All garbage has been successfully collected" << endl;
     return 0;