Include cleanup, better error handling

Jan Breuer

2012-11-27 884a288cc0f15f5ab9ea36077b08ff002ff7eac2

 netbeans/nbproject/Makefile-Release.mk

@@ -34,10 +34,12 @@

# Object Files
OBJECTFILES= \
   ${OBJECTDIR}/_ext/760632520/scpi_debug.o \
   ${OBJECTDIR}/_ext/760632520/scpi_utils.o \
   ${OBJECTDIR}/_ext/760632520/scpi_fifo.o \
   ${OBJECTDIR}/_ext/760632520/scpi_ieee488.o \
   ${OBJECTDIR}/_ext/760632520/scpi.o \
   ${OBJECTDIR}/_ext/760632520/scpi_minimal.o \
   ${OBJECTDIR}/_ext/760632520/scpi_parser.o \
   ${OBJECTDIR}/_ext/1472/test-parser.o \
   ${OBJECTDIR}/_ext/760632520/scpi_units.o \
   ${OBJECTDIR}/_ext/760632520/scpi_error.o
@@ -47,6 +49,7 @@

# Test Files
TESTFILES= \
   ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans \
   ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans

# C Compiler Flags
@@ -73,25 +76,35 @@
   ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
   ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/scpi_parser ${OBJECTFILES} ${LDLIBSOPTIONS} 

${OBJECTDIR}/_ext/760632520/scpi_debug.o: nbproject/Makefile-${CND_CONF}.mk ../scpi/scpi_debug.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_debug.o ../scpi/scpi_debug.c

${OBJECTDIR}/_ext/760632520/scpi_utils.o: nbproject/Makefile-${CND_CONF}.mk ../scpi/scpi_utils.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_utils.o ../scpi/scpi_utils.c

${OBJECTDIR}/_ext/760632520/scpi_fifo.o: nbproject/Makefile-${CND_CONF}.mk ../scpi/scpi_fifo.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_fifo.o ../scpi/scpi_fifo.c

${OBJECTDIR}/_ext/760632520/scpi_ieee488.o: nbproject/Makefile-${CND_CONF}.mk ../scpi/scpi_ieee488.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_ieee488.o ../scpi/scpi_ieee488.c

${OBJECTDIR}/_ext/760632520/scpi.o: nbproject/Makefile-${CND_CONF}.mk ../scpi/scpi.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi.o ../scpi/scpi.c

${OBJECTDIR}/_ext/760632520/scpi_minimal.o: nbproject/Makefile-${CND_CONF}.mk ../scpi/scpi_minimal.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_minimal.o ../scpi/scpi_minimal.c

${OBJECTDIR}/_ext/760632520/scpi_parser.o: nbproject/Makefile-${CND_CONF}.mk ../scpi/scpi_parser.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_parser.o ../scpi/scpi_parser.c

${OBJECTDIR}/_ext/1472/test-parser.o: nbproject/Makefile-${CND_CONF}.mk ../test-parser.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/1472
@@ -113,9 +126,19 @@

# Build Test Targets
.build-tests-conf: .build-conf ${TESTFILES}
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans: ${TESTDIR}/tests/test_fifo.o ${OBJECTFILES:%.o=%_nomain.o}
   ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
   ${LINK.c}   -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans $^ ${LDLIBSOPTIONS} 

${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans: ${TESTDIR}/tests/test_scpi_utils.o ${OBJECTFILES:%.o=%_nomain.o}
   ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
   ${LINK.c}   -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans $^ ${LDLIBSOPTIONS} 


${TESTDIR}/tests/test_fifo.o: tests/test_fifo.c 
   ${MKDIR} -p ${TESTDIR}/tests
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${TESTDIR}/tests/test_fifo.o tests/test_fifo.c


${TESTDIR}/tests/test_scpi_utils.o: tests/test_scpi_utils.c 
@@ -123,6 +146,19 @@
   ${RM} $@.d
   $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${TESTDIR}/tests/test_scpi_utils.o tests/test_scpi_utils.c


${OBJECTDIR}/_ext/760632520/scpi_debug_nomain.o: ${OBJECTDIR}/_ext/760632520/scpi_debug.o ../scpi/scpi_debug.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   @NMOUTPUT=`${NM} ${OBJECTDIR}/_ext/760632520/scpi_debug.o`; \
   if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
   then  \
       ${RM} $@.d;\
       $(COMPILE.c) -O2 -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_debug_nomain.o ../scpi/scpi_debug.c;\
   else  \
       ${CP} ${OBJECTDIR}/_ext/760632520/scpi_debug.o ${OBJECTDIR}/_ext/760632520/scpi_debug_nomain.o;\
   fi

${OBJECTDIR}/_ext/760632520/scpi_utils_nomain.o: ${OBJECTDIR}/_ext/760632520/scpi_utils.o ../scpi/scpi_utils.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
@@ -135,6 +171,19 @@
       $(COMPILE.c) -O2 -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_utils_nomain.o ../scpi/scpi_utils.c;\
   else  \
       ${CP} ${OBJECTDIR}/_ext/760632520/scpi_utils.o ${OBJECTDIR}/_ext/760632520/scpi_utils_nomain.o;\
   fi

${OBJECTDIR}/_ext/760632520/scpi_fifo_nomain.o: ${OBJECTDIR}/_ext/760632520/scpi_fifo.o ../scpi/scpi_fifo.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   @NMOUTPUT=`${NM} ${OBJECTDIR}/_ext/760632520/scpi_fifo.o`; \
   if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
   then  \
       ${RM} $@.d;\
       $(COMPILE.c) -O2 -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_fifo_nomain.o ../scpi/scpi_fifo.c;\
   else  \
       ${CP} ${OBJECTDIR}/_ext/760632520/scpi_fifo.o ${OBJECTDIR}/_ext/760632520/scpi_fifo_nomain.o;\
   fi

${OBJECTDIR}/_ext/760632520/scpi_ieee488_nomain.o: ${OBJECTDIR}/_ext/760632520/scpi_ieee488.o ../scpi/scpi_ieee488.c 
@@ -150,19 +199,6 @@
       ${CP} ${OBJECTDIR}/_ext/760632520/scpi_ieee488.o ${OBJECTDIR}/_ext/760632520/scpi_ieee488_nomain.o;\
   fi

${OBJECTDIR}/_ext/760632520/scpi_nomain.o: ${OBJECTDIR}/_ext/760632520/scpi.o ../scpi/scpi.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   @NMOUTPUT=`${NM} ${OBJECTDIR}/_ext/760632520/scpi.o`; \
   if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
   then  \
       ${RM} $@.d;\
       $(COMPILE.c) -O2 -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_nomain.o ../scpi/scpi.c;\
   else  \
       ${CP} ${OBJECTDIR}/_ext/760632520/scpi.o ${OBJECTDIR}/_ext/760632520/scpi_nomain.o;\
   fi

${OBJECTDIR}/_ext/760632520/scpi_minimal_nomain.o: ${OBJECTDIR}/_ext/760632520/scpi_minimal.o ../scpi/scpi_minimal.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   @NMOUTPUT=`${NM} ${OBJECTDIR}/_ext/760632520/scpi_minimal.o`; \
@@ -174,6 +210,19 @@
       $(COMPILE.c) -O2 -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_minimal_nomain.o ../scpi/scpi_minimal.c;\
   else  \
       ${CP} ${OBJECTDIR}/_ext/760632520/scpi_minimal.o ${OBJECTDIR}/_ext/760632520/scpi_minimal_nomain.o;\
   fi

${OBJECTDIR}/_ext/760632520/scpi_parser_nomain.o: ${OBJECTDIR}/_ext/760632520/scpi_parser.o ../scpi/scpi_parser.c 
   ${MKDIR} -p ${OBJECTDIR}/_ext/760632520
   @NMOUTPUT=`${NM} ${OBJECTDIR}/_ext/760632520/scpi_parser.o`; \
   if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
      (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
   then  \
       ${RM} $@.d;\
       $(COMPILE.c) -O2 -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/760632520/scpi_parser_nomain.o ../scpi/scpi_parser.c;\
   else  \
       ${CP} ${OBJECTDIR}/_ext/760632520/scpi_parser.o ${OBJECTDIR}/_ext/760632520/scpi_parser_nomain.o;\
   fi

${OBJECTDIR}/_ext/1472/test-parser_nomain.o: ${OBJECTDIR}/_ext/1472/test-parser.o ../test-parser.c 
@@ -220,6 +269,7 @@
   @if [ "${TEST}" = "" ]; \
   then  \
       ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans || true; \
       ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/netbeans || true; \
   else  \
       ./${TEST} || true; \
   fi