Index: branches/FEPSimulator/nbproject/Makefile-Release.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-Release.mk	(revision 80)
+++ branches/FEPSimulator/nbproject/Makefile-Release.mk	(revision 224)
@@ -22,5 +22,5 @@
 
 # Macros
-CND_PLATFORM=GNU-Linux-x86
+CND_PLATFORM=GNU-Linux
 CND_DLIB_EXT=so
 CND_CONF=Release
@@ -37,6 +37,7 @@
 OBJECTFILES= \
 	${OBJECTDIR}/DataPacker.o \
-	${OBJECTDIR}/FEPClient.o \
-	${OBJECTDIR}/NetworkReader.o \
+	${OBJECTDIR}/FEPSim.o \
+	${OBJECTDIR}/HighwaysParser.o \
+	${OBJECTDIR}/Main.o \
 	${OBJECTDIR}/fep_clnt.o \
 	${OBJECTDIR}/fep_xdr.o
@@ -61,31 +62,36 @@
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
+	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS}
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS}
 
-${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
+${OBJECTDIR}/DataPacker.o: DataPacker.cpp
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
 	$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
-${OBJECTDIR}/FEPClient.o: FEPClient.cpp 
+${OBJECTDIR}/FEPSim.o: FEPSim.cpp
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPClient.o FEPClient.cpp
+	$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
-${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp 
+${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp
+	$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
 
-${OBJECTDIR}/fep_clnt.o: fep_clnt.c 
+${OBJECTDIR}/Main.o: Main.cpp
+	${MKDIR} -p ${OBJECTDIR}
+	${RM} "$@.d"
+	$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
+
+${OBJECTDIR}/fep_clnt.o: fep_clnt.c
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
 	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
 
-${OBJECTDIR}/fep_xdr.o: fep_xdr.c 
+${OBJECTDIR}/fep_xdr.o: fep_xdr.c
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
@@ -98,5 +104,4 @@
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
 
 # Subprojects