# HG changeset patch # User Michiel Broek # Date 1398180390 -7200 # Node ID e854e3d704dee8d7c359b9babd9c3b023c36fd64 # Parent 217c90acc389f9dc219c1f038c69d4449bd07675 Basic package is complete diff -r 217c90acc389 -r e854e3d704de .hgignore --- a/.hgignore Tue Apr 22 17:08:15 2014 +0200 +++ b/.hgignore Tue Apr 22 17:26:30 2014 +0200 @@ -5,6 +5,7 @@ stamp-h autom4te.cache .filelist +thermometers/thermometers syntax: glob *.o diff -r 217c90acc389 -r e854e3d704de Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile Tue Apr 22 17:26:30 2014 +0200 @@ -0,0 +1,32 @@ +# Top-level makefile for mbsePi-apps. + +include Makefile.global + +OTHER = ChangeLog COPYING Makefile Makefile.global.in aclocal.m4 \ + config.h.in configure configure.ac +TARFILE = ${PACKAGE}-${VERSION}.tar.bz2 + +############################################################################### + + +all depend: + for d in ${SUBDIRS}; do (cd $$d && ${MAKE} $@) || exit; done; + +install: + for d in ${SUBDIRS}; do (cd $$d && ${MAKE} $@) || exit; done; + +dist tar: ${TARFILE} + +clean: + for d in ${SUBDIRS}; do (cd $$d && ${MAKE} $@) || exit; done; + rm -f .filelist core ${TARFILE} config.h Makefile.global + +${TARFILE}: .filelist + cd ..; ln -s ${PACKAGE} ${PACKAGE}-${VERSION} ; rm -f ${TARFILE}; \ + ${TAR} cvTf ./${PACKAGE}-${VERSION}/.filelist - | bzip2 >${TARFILE} ; \ + rm -f ${PACKAGE}-${VERSION} + +.filelist filelist: + (for f in ${OTHER} ;do echo ${PACKAGE}-${VERSION}/$$f; done) >.filelist + for d in ${SUBDIRS}; do (cd $$d && ${MAKE} filelist && cat filelist >>../.filelist) || exit; done; + diff -r 217c90acc389 -r e854e3d704de thermometers/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thermometers/Makefile Tue Apr 22 17:26:30 2014 +0200 @@ -0,0 +1,57 @@ +# Makefile for the mbsePi-apps/thermometers. + +include ../Makefile.global + +SRCS = main.c +HDRS = main.h +OBJS = main.o +TARGET = thermometers +OTHER = Makefile + +############################################################################# + +.c.o: + ${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -c $< + +all: ${TARGET} + +thermometers: ${OBJS} + ${CC} -o thermometers ${OBJS} ${LDFLAGS} ${LIBS} + +clean: + rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak + +install: all + ${INSTALL} -c -s -g root -o root -m 0755 thermometers ${BINDIR} + +filelist: Makefile + BASE=`pwd`; \ + BASE=`basename $${BASE}`; \ + (for f in ${SRCS} ${HDRS} ${OTHER} ;do echo ${PACKAGE}-${VERSION}/$${BASE}/$$f; done) >filelist + +depend: + @rm -f Makefile.bak; \ + mv Makefile Makefile.bak; \ + sed -e '/^# DO NOT DELETE/,$$d' Makefile.bak >Makefile; \ + ${ECHO} '# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT' \ + >>Makefile; \ + ${ECHO} '# Dependencies generated by make depend' >>Makefile; \ + for f in ${SRCS}; \ + do \ + ${ECHO} "Dependencies for $$f:\c"; \ + ${ECHO} "`basename $$f .c`.o:\c" >>Makefile; \ + for h in `sed -n -e \ + 's/^#[ ]*include[ ]*"\([^"]*\)".*/\1/p' $$f`; \ + do \ + ${ECHO} " $$h\c"; \ + ${ECHO} " $$h\c" >>Makefile; \ + done; \ + ${ECHO} " done."; \ + ${ECHO} "" >>Makefile; \ + done; \ + ${ECHO} '# End of generated dependencies' >>Makefile + +# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT +# Dependencies generated by make depend +main.o: main.h +# End of generated dependencies diff -r 217c90acc389 -r e854e3d704de thermometers/main.c --- a/thermometers/main.c Tue Apr 22 17:08:15 2014 +0200 +++ b/thermometers/main.c Tue Apr 22 17:26:30 2014 +0200 @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include #include "main.h" @@ -40,13 +43,13 @@ void die(int onsig) { switch (onsig) { - case SIGHUP: Log_Msg("[main] Hangup detected"); + case SIGHUP: fprintf(stdout, "[main] Hangup detected"); break; - case SIGINT: Log_Msg("[main] Interrupt from keyboard"); + case SIGINT: fprintf(stdout, "[main] Interrupt from keyboard"); break; - case SIGTERM: Log_Msg("[main] Termination signal received"); + case SIGTERM: fprintf(stdout, "[main] Termination signal received"); break; - default: Log_Msg("[main] die on signal %d", onsig); + default: fprintf(stdout, "[main] die on signal %d", onsig); } exit(onsig); @@ -56,12 +59,7 @@ int main(int argc, char *argv[]) { - int i, c, rc; - int bForceReset = FALSE; - SDL_Event event; - char *path, name[128], *Range, *p; - FILE *fp; - unsigned int tmp1, tmp2; + int i, c; while (1) { int option_index = 0;