Bug 119: Seems to be building again.

MAC/APL/PAC/LBA_Calibration/MatlabCal.spec.in → MAC/APL/PAC/LBA_Calibration/LBA_Calibration.spec.in

 # -*- Mode:rpm-spec -*-
-# MatlabCal.spec.in
+# LBA_Calibration.spec.in
 #
 
 ##############################################################################
@@ -8,7 +8,7 @@
 #
 ##############################################################################
 
-Summary: The MatlabCal library creates a C-library from matlab code.
+Summary: The LBA_Calibration library creates a C-library from matlab code.
 
 %define release @RPM_RELEASE@
 %define version @VERSION@
@@ -37,7 +37,7 @@ AutoReqProv: no
 
 %description
 
-The MatlabCal library implements LBA station calibration by compiling Matlab
+The LBA_Calibration library implements LBA station calibration by compiling Matlab
 code with the MatLab compiler into a C-lib that can be used by the CalServer.
 
 ##############################################################################

MAC/APL/PAC/LBA_Calibration/configure.in

@@ -5,7 +5,7 @@ AC_INIT
 dnl AC_CONFIG_AUX_DIR(config)
 dnl AM_CONFIG_HEADER(config/config.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MatlabCal, 1.0, no-define)
+AM_INIT_AUTOMAKE(LBA_Calibration, 1.0, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
@@ -59,9 +59,9 @@ dnl
 dnl Output Makefiles
 dnl
 AC_OUTPUT(
-include/APL/MatlabCal/Makefile
+include/APL/LBA_Calibration/Makefile
 src/Makefile
 test/Makefile
 Makefile
-MatlabCal.spec
+LBA_Calibration.spec
 )

MAC/APL/PAC/LBA_Calibration/include/APL/MatlabCal/Makefile.am → MAC/APL/PAC/LBA_Calibration/include/APL/LBA_Calibration/Makefile.am

 INSTHDRS			= 
 NOINSTHDRS			= 
 TCCHDRS				= 
-pkgincludedir		= $(includedir)/APL/MatlabCal
+pkgincludedir		= $(includedir)/APL/LBA_Calibration
 pkginclude_HEADERS	= $(INSTHDRS) $(TCCHDRS)
 noinst_HEADERS		= $(NOINSTHDRS)
 DOCHDRS				= $(INSTHDRS) $(NOINSTHDRS)

MAC/APL/PAC/LBA_Calibration/package.dox

 // \ingroup PAC
-// \defgroup MatlabCal Compilation of Matlab calibration routines.
+// \defgroup LBA_Calibration Compilation of Matlab calibration routines.

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

@@ -22,7 +22,7 @@ BUILT_SOURCES	= liblba_calibration.so
 #libcalibrate_la_SOURCES = calibrate.m 
 
 
-pkgincludedir = $(includedir)/APL/MatlabCal
+pkgincludedir = $(includedir)/APL/LBA_Calibration
 #pkginclude_HEADERS = $(BUILT_SOURCES)
 
 include $(top_srcdir)/Makefile.common

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

@@ -8,7 +8,7 @@ sbin_PROGRAMS = \
 	tCalibrate
 
 tCalibrate_SOURCES 	= $(BUILT_SOURCES) tCalibrate.cc
-tCalibrate_LDADD	= -llba_calibration $(LOFAR_DEPEND)
+tCalibrate_LDADD	= -llba_calibration -L../src/ $(LOFAR_DEPEND)
 tCalibrate_DEPENDENCIES	= $(LOFAR_DEPEND)
 
 BUILT_SOURCES = 

MAC/APL/PAC/LBA_Calibration/test/tCalibrate.cc

-#include <APL/MatlabCal/lba_calibration.h>
+#include <APL/LBA_Calibration/lba_calibration.h>
 #include <iostream>
 #include <fstream>
 #include <iterator>