Index: branches/FEPSimulator/nbproject/Makefile-Debug.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 174)
+++ branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 185)
@@ -38,6 +38,6 @@
 	${OBJECTDIR}/DataPacker.o \
 	${OBJECTDIR}/FEPSim.o \
+	${OBJECTDIR}/HighwaysParser.o \
 	${OBJECTDIR}/Main.o \
-	${OBJECTDIR}/NetworkReader.o \
 	${OBJECTDIR}/fep_clnt.o \
 	${OBJECTDIR}/fep_xdr.o
@@ -58,11 +58,9 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=tinyxml/tinyxml.a
+LDLIBSOPTIONS=
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
 	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
-
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
@@ -80,13 +78,13 @@
 	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
+${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp 
+	${MKDIR} -p ${OBJECTDIR}
+	${RM} "$@.d"
+	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
+
 ${OBJECTDIR}/Main.o: Main.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
 	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
-
-${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp
 
 ${OBJECTDIR}/fep_clnt.o: fep_clnt.c