[Genabel-commits] r1411 - pkg/filevector

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2013-11-21 10:29:15 +0100 (Thu, 21 Nov 2013)
New Revision: 1411

Modified:
   pkg/filevector/Makefile
Log:
Add the -D_NOT_R_FILEVECTOR to the CFLAGS in filevector's Makefile, otherwise fvutils won't compile. 

Also removed some 'white space at the end of the line' across the Makefile.


Modified: pkg/filevector/Makefile
===================================================================
--- pkg/filevector/Makefile	2013-11-21 06:38:30 UTC (rev 1410)
+++ pkg/filevector/Makefile	2013-11-21 09:29:15 UTC (rev 1411)
@@ -29,7 +29,7 @@
 # use for Solaris
 # CPP = CC
 
-CFLAGS = -I $(LIBDIR) -I $(SRCDIR) -g -Wall -std=c++11 #-m64 
+CFLAGS = -I $(LIBDIR) -I $(SRCDIR) -g -Wall -std=c++11 -D_NOT_R_FILEVECTOR #-m64
 CPPUNITFLAGS = -lcppunit
 EXECS = $(TEXT2FVF) $(MERGEVARS) ${CONVERT}
 
@@ -86,7 +86,7 @@
 	$(CPP) $(CFLAGS) $(LIBDIR)/*.cpp $(TESTSDIR)/TestUtil.cpp $(TESTSDIR)/ReusableFileHandleTest.cpp $(CPPUNITFLAGS) -o $(RFHTEST); $(RFHTEST)
 
 converter : $(CONVERT)
-$(CONVERT): $(LIBFILES) $(SRCDIR)/convert.cpp 
+$(CONVERT): $(LIBFILES) $(SRCDIR)/convert.cpp
 	$(CPP) $(CFLAGS) $(LIBDIR)/*.cpp $(SRCDIR)/text2fvf.cpp $(SRCDIR)/convert.cpp $(CPPUNITFLAGS) -o $(CONVERT)
 
 transpose :$(TRANSPOSE)
@@ -107,14 +107,14 @@
 	$(CPP) $(CFLAGS) $(LIBDIR)/*.cpp $(SRCDIR)/text2fvf.cpp $(TESTSDIR)/TestUtil.cpp $(TESTSDIR)/ConvertTest.cpp $(CPPUNITFLAGS) -o $(CONVERTTEST); $(CONVERTTEST)
 
 buildtestdata : $(BUILDTESTDATA)
-$(BUILDTESTDATA):$(TESTSDIR)/BuildTestData.cpp $(LIBDIR)/*.cpp $(LIBDIR)/*.h 
+$(BUILDTESTDATA):$(TESTSDIR)/BuildTestData.cpp $(LIBDIR)/*.cpp $(LIBDIR)/*.h
 	$(CPP) $(CFLAGS) $(TESTSDIR)/BuildTestData.cpp $(LIBDIR)/*.cpp $(CPPUNITFLAGS) -o $(BUILDTESTDATA)
 
-preparetestdata: buildtestdata 
-	$(BUILDTESTDATA) tests/data/correctnessTestData 33815 1473 100 120; $(BUILDTESTDATA) tests/data/2write/modify_me 1001 1003; 
+preparetestdata: buildtestdata
+	$(BUILDTESTDATA) tests/data/correctnessTestData 33815 1473 100 120; $(BUILDTESTDATA) tests/data/2write/modify_me 1001 1003;
 
 tests : preparetestdata correctnesstest readspeed modificationtest unittest writespeed accessmodetest converttest transposetest
 runtests : tests
 
-tests-clean: 
+tests-clean:
 	rm -rf tests/data/2write/* tests/data/modetests/* tests/data/correctnessTestData.*