Index: branches/FEPSimulator/nbproject/Makefile-Debug.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 209)
+++ branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 214)
@@ -51,9 +51,9 @@
 
 # C Compiler Flags
-CFLAGS=`cppunit-config --cflags` 
+CFLAGS=
 
 # CC Compiler Flags
-CCFLAGS=`cppunit-config --cflags` 
-CXXFLAGS=`cppunit-config --cflags` 
+CCFLAGS=
+CXXFLAGS=
 
 # Fortran Compiler Flags
@@ -77,30 +77,30 @@
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
+	$(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
 ${OBJECTDIR}/FEPSim.o: FEPSim.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
+	$(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
 ${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
+	$(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
 
 ${OBJECTDIR}/Main.o: Main.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
+	$(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
 
 ${OBJECTDIR}/fep_clnt.o: fep_clnt.c 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.c) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
+	$(COMPILE.c) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
 
 ${OBJECTDIR}/fep_xdr.o: fep_xdr.c 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.c) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr.o fep_xdr.c
+	$(COMPILE.c) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr.o fep_xdr.c
 
 # Subprojects
@@ -117,5 +117,5 @@
 	${MKDIR} -p ${TESTDIR}/tests
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -I. -I. -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/HighwaysParserTest.o tests/HighwaysParserTest.cpp
+	$(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/HighwaysParserTest.o tests/HighwaysParserTest.cpp
 
 
@@ -128,5 +128,5 @@
 	then  \
 	    ${RM} "$@.d";\
-	    $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker_nomain.o DataPacker.cpp;\
+	    $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker_nomain.o DataPacker.cpp;\
 	else  \
 	    ${CP} ${OBJECTDIR}/DataPacker.o ${OBJECTDIR}/DataPacker_nomain.o;\
@@ -141,5 +141,5 @@
 	then  \
 	    ${RM} "$@.d";\
-	    $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim_nomain.o FEPSim.cpp;\
+	    $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim_nomain.o FEPSim.cpp;\
 	else  \
 	    ${CP} ${OBJECTDIR}/FEPSim.o ${OBJECTDIR}/FEPSim_nomain.o;\
@@ -154,5 +154,5 @@
 	then  \
 	    ${RM} "$@.d";\
-	    $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser_nomain.o HighwaysParser.cpp;\
+	    $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser_nomain.o HighwaysParser.cpp;\
 	else  \
 	    ${CP} ${OBJECTDIR}/HighwaysParser.o ${OBJECTDIR}/HighwaysParser_nomain.o;\
@@ -167,5 +167,5 @@
 	then  \
 	    ${RM} "$@.d";\
-	    $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main_nomain.o Main.cpp;\
+	    $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main_nomain.o Main.cpp;\
 	else  \
 	    ${CP} ${OBJECTDIR}/Main.o ${OBJECTDIR}/Main_nomain.o;\
@@ -180,5 +180,5 @@
 	then  \
 	    ${RM} "$@.d";\
-	    $(COMPILE.c) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt_nomain.o fep_clnt.c;\
+	    $(COMPILE.c) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt_nomain.o fep_clnt.c;\
 	else  \
 	    ${CP} ${OBJECTDIR}/fep_clnt.o ${OBJECTDIR}/fep_clnt_nomain.o;\
@@ -193,5 +193,5 @@
 	then  \
 	    ${RM} "$@.d";\
-	    $(COMPILE.c) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr_nomain.o fep_xdr.c;\
+	    $(COMPILE.c) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr_nomain.o fep_xdr.c;\
 	else  \
 	    ${CP} ${OBJECTDIR}/fep_xdr.o ${OBJECTDIR}/fep_xdr_nomain.o;\