stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

reorganized directory structure (seperated protocols)

Browse source
This commit is contained in:
Steffen Vogel 2012-01-19 18:20:52 +01:00
parent 75457b8ef5
commit e8a105a2cd
24 changed files with 179 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/logger/src/threads.c
View file

@ -26,6 +26,8 @@
#include <math.h>
#include <unistd.h>
#include <reading.h>
#include "threads.h"
#include "api.h"
#include "vzlogger.h"

18
bin/logger/web/config.html Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>vzlogger - configuration</title>
<script src="jquery.min.js" type="text/javascript"></script>
<script src="script.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="style.css">
</head>
<body>
<div id="wrapper">
test
</div>
</body>
</html>

BIN
bin/logger/web/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

4
bin/logger/web/jquery.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

BIN
bin/logger/web/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

15
bin/logger/web/style.css Normal file
View file

@ -0,0 +1,15 @@
html, body {
background-color: #0292C0;
font-family: arial,helvetica,sans-serif;
font-weight: lighter;
height: 100%;
}
#wrapper {
background-color: white;
border: 1px solid black;
border-radius: 10px 10px 10px 10px;
margin: 50px auto 20px;
padding: 10px;
width: 90%;
}

14
include/meter.h
View file

@ -43,14 +43,14 @@
#include "reading.h"
/* meter protocols */
#include "file.h"
#include "exec.h"
#include "random.h"
#include "s0.h"
#include "d0.h"
#include "fluksov2.h"
#include "protocols/file.h"
#include "protocols/exec.h"
#include "protocols/random.h"
#include "protocols/s0.h"
#include "protocols/d0.h"
#include "protocols/fluksov2.h"
#ifdef SML_SUPPORT
#include "sml.h"
#include "protocols/sml.h"
#endif /* SML_SUPPORT */
typedef enum meter_procotol {

0
include/d0.h → include/protocols/d0.h
View file

0
include/exec.h → include/protocols/exec.h
View file

0
include/file.h → include/protocols/file.h
View file

0
include/fluksov2.h → include/protocols/fluksov2.h
View file

0
include/random.h → include/protocols/random.h
View file

0
include/s0.h → include/protocols/s0.h
View file

0
include/sml.h → include/protocols/sml.h
View file

2
include/reading.h
View file

@ -26,6 +26,8 @@
#ifndef _READING_H_
#define _READING_H_
#include <sys/time.h>
#include "obis.h"
#define MAX_IDENTIFIER_LEN 255

12
src/Makefile.am
View file

@ -6,12 +6,20 @@ VERSION = 1:0:0
lib_LIBRARIES = libmtr.a
libmtr_a_SOURCES = meter.c d0.c s0.c random.c file.c exec.c fluksov2.c ltqnorm.c obis.c options.c reading.c
libmtr_a_SOURCES = meter.c ltqnorm.c obis.c options.c reading.c
libmtr_a_SOURCES += \
protocols/s0.c \
protocols/d0.c \
protocols/fluksov2.c \
protocols/file.c \
protocols/exec.c \
protocols/random.c
libmtr_a_LDFLAGS = -version-info $(VERSION)
# SML support
####################################################################
if SML_SUPPORT
libmtr_a_SOURCES += sml.c
libmtr_a_SOURCES += protocols/sml.c
AM_CFLAGS += $(DEPS_SML_CFLAGS)
endif

120
src/Makefile.in
View file

@ -35,7 +35,7 @@ POST_UNINSTALL = :
# SML support
####################################################################
@SML_SUPPORT_TRUE@am__append_1 = sml.c
@SML_SUPPORT_TRUE@am__append_1 = protocols/sml.c
@SML_SUPPORT_TRUE@am__append_2 = $(DEPS_SML_CFLAGS)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@ -74,13 +74,15 @@ AR = ar
ARFLAGS = cru
libmtr_a_AR = $(AR) $(ARFLAGS)
libmtr_a_LIBADD =
am__libmtr_a_SOURCES_DIST = meter.c d0.c s0.c random.c file.c exec.c \
fluksov2.c ltqnorm.c obis.c options.c reading.c sml.c
am__libmtr_a_SOURCES_DIST = meter.c ltqnorm.c obis.c options.c \
reading.c protocols/s0.c protocols/d0.c protocols/fluksov2.c \
protocols/file.c protocols/exec.c protocols/random.c \
protocols/sml.c
@SML_SUPPORT_TRUE@am__objects_1 = sml.$(OBJEXT)
am_libmtr_a_OBJECTS = meter.$(OBJEXT) d0.$(OBJEXT) s0.$(OBJEXT) \
random.$(OBJEXT) file.$(OBJEXT) exec.$(OBJEXT) \
fluksov2.$(OBJEXT) ltqnorm.$(OBJEXT) obis.$(OBJEXT) \
options.$(OBJEXT) reading.$(OBJEXT) $(am__objects_1)
am_libmtr_a_OBJECTS = meter.$(OBJEXT) ltqnorm.$(OBJEXT) obis.$(OBJEXT) \
options.$(OBJEXT) reading.$(OBJEXT) s0.$(OBJEXT) d0.$(OBJEXT) \
fluksov2.$(OBJEXT) file.$(OBJEXT) exec.$(OBJEXT) \
random.$(OBJEXT) $(am__objects_1)
libmtr_a_OBJECTS = $(am_libmtr_a_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@ -195,8 +197,10 @@ AM_CFLAGS = -Wall -D_REENTRANT -std=gnu99 $(am__append_2)
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_LDFLAGS =
lib_LIBRARIES = libmtr.a
libmtr_a_SOURCES = meter.c d0.c s0.c random.c file.c exec.c fluksov2.c \
ltqnorm.c obis.c options.c reading.c $(am__append_1)
libmtr_a_SOURCES = meter.c ltqnorm.c obis.c options.c reading.c \
protocols/s0.c protocols/d0.c protocols/fluksov2.c \
protocols/file.c protocols/exec.c protocols/random.c \
$(am__append_1)
libmtr_a_LDFLAGS = -version-info $(VERSION)
all: all-am
@ -302,6 +306,104 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
s0.o: protocols/s0.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s0.o -MD -MP -MF $(DEPDIR)/s0.Tpo -c -o s0.o `test -f 'protocols/s0.c' || echo '$(srcdir)/'`protocols/s0.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/s0.Tpo $(DEPDIR)/s0.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/s0.c' object='s0.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s0.o `test -f 'protocols/s0.c' || echo '$(srcdir)/'`protocols/s0.c
s0.obj: protocols/s0.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s0.obj -MD -MP -MF $(DEPDIR)/s0.Tpo -c -o s0.obj `if test -f 'protocols/s0.c'; then $(CYGPATH_W) 'protocols/s0.c'; else $(CYGPATH_W) '$(srcdir)/protocols/s0.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/s0.Tpo $(DEPDIR)/s0.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/s0.c' object='s0.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s0.obj `if test -f 'protocols/s0.c'; then $(CYGPATH_W) 'protocols/s0.c'; else $(CYGPATH_W) '$(srcdir)/protocols/s0.c'; fi`
d0.o: protocols/d0.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT d0.o -MD -MP -MF $(DEPDIR)/d0.Tpo -c -o d0.o `test -f 'protocols/d0.c' || echo '$(srcdir)/'`protocols/d0.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/d0.Tpo $(DEPDIR)/d0.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/d0.c' object='d0.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o d0.o `test -f 'protocols/d0.c' || echo '$(srcdir)/'`protocols/d0.c
d0.obj: protocols/d0.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT d0.obj -MD -MP -MF $(DEPDIR)/d0.Tpo -c -o d0.obj `if test -f 'protocols/d0.c'; then $(CYGPATH_W) 'protocols/d0.c'; else $(CYGPATH_W) '$(srcdir)/protocols/d0.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/d0.Tpo $(DEPDIR)/d0.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/d0.c' object='d0.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o d0.obj `if test -f 'protocols/d0.c'; then $(CYGPATH_W) 'protocols/d0.c'; else $(CYGPATH_W) '$(srcdir)/protocols/d0.c'; fi`
fluksov2.o: protocols/fluksov2.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fluksov2.o -MD -MP -MF $(DEPDIR)/fluksov2.Tpo -c -o fluksov2.o `test -f 'protocols/fluksov2.c' || echo '$(srcdir)/'`protocols/fluksov2.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fluksov2.Tpo $(DEPDIR)/fluksov2.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/fluksov2.c' object='fluksov2.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fluksov2.o `test -f 'protocols/fluksov2.c' || echo '$(srcdir)/'`protocols/fluksov2.c
fluksov2.obj: protocols/fluksov2.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fluksov2.obj -MD -MP -MF $(DEPDIR)/fluksov2.Tpo -c -o fluksov2.obj `if test -f 'protocols/fluksov2.c'; then $(CYGPATH_W) 'protocols/fluksov2.c'; else $(CYGPATH_W) '$(srcdir)/protocols/fluksov2.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fluksov2.Tpo $(DEPDIR)/fluksov2.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/fluksov2.c' object='fluksov2.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fluksov2.obj `if test -f 'protocols/fluksov2.c'; then $(CYGPATH_W) 'protocols/fluksov2.c'; else $(CYGPATH_W) '$(srcdir)/protocols/fluksov2.c'; fi`
file.o: protocols/file.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file.o -MD -MP -MF $(DEPDIR)/file.Tpo -c -o file.o `test -f 'protocols/file.c' || echo '$(srcdir)/'`protocols/file.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/file.Tpo $(DEPDIR)/file.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/file.c' object='file.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file.o `test -f 'protocols/file.c' || echo '$(srcdir)/'`protocols/file.c
file.obj: protocols/file.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file.obj -MD -MP -MF $(DEPDIR)/file.Tpo -c -o file.obj `if test -f 'protocols/file.c'; then $(CYGPATH_W) 'protocols/file.c'; else $(CYGPATH_W) '$(srcdir)/protocols/file.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/file.Tpo $(DEPDIR)/file.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/file.c' object='file.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file.obj `if test -f 'protocols/file.c'; then $(CYGPATH_W) 'protocols/file.c'; else $(CYGPATH_W) '$(srcdir)/protocols/file.c'; fi`
exec.o: protocols/exec.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exec.o -MD -MP -MF $(DEPDIR)/exec.Tpo -c -o exec.o `test -f 'protocols/exec.c' || echo '$(srcdir)/'`protocols/exec.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/exec.Tpo $(DEPDIR)/exec.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/exec.c' object='exec.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o exec.o `test -f 'protocols/exec.c' || echo '$(srcdir)/'`protocols/exec.c
exec.obj: protocols/exec.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exec.obj -MD -MP -MF $(DEPDIR)/exec.Tpo -c -o exec.obj `if test -f 'protocols/exec.c'; then $(CYGPATH_W) 'protocols/exec.c'; else $(CYGPATH_W) '$(srcdir)/protocols/exec.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/exec.Tpo $(DEPDIR)/exec.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/exec.c' object='exec.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o exec.obj `if test -f 'protocols/exec.c'; then $(CYGPATH_W) 'protocols/exec.c'; else $(CYGPATH_W) '$(srcdir)/protocols/exec.c'; fi`
random.o: protocols/random.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT random.o -MD -MP -MF $(DEPDIR)/random.Tpo -c -o random.o `test -f 'protocols/random.c' || echo '$(srcdir)/'`protocols/random.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/random.Tpo $(DEPDIR)/random.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/random.c' object='random.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o random.o `test -f 'protocols/random.c' || echo '$(srcdir)/'`protocols/random.c
random.obj: protocols/random.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT random.obj -MD -MP -MF $(DEPDIR)/random.Tpo -c -o random.obj `if test -f 'protocols/random.c'; then $(CYGPATH_W) 'protocols/random.c'; else $(CYGPATH_W) '$(srcdir)/protocols/random.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/random.Tpo $(DEPDIR)/random.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/random.c' object='random.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o random.obj `if test -f 'protocols/random.c'; then $(CYGPATH_W) 'protocols/random.c'; else $(CYGPATH_W) '$(srcdir)/protocols/random.c'; fi`
sml.o: protocols/sml.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sml.o -MD -MP -MF $(DEPDIR)/sml.Tpo -c -o sml.o `test -f 'protocols/sml.c' || echo '$(srcdir)/'`protocols/sml.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sml.Tpo $(DEPDIR)/sml.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/sml.c' object='sml.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sml.o `test -f 'protocols/sml.c' || echo '$(srcdir)/'`protocols/sml.c
sml.obj: protocols/sml.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sml.obj -MD -MP -MF $(DEPDIR)/sml.Tpo -c -o sml.obj `if test -f 'protocols/sml.c'; then $(CYGPATH_W) 'protocols/sml.c'; else $(CYGPATH_W) '$(srcdir)/protocols/sml.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sml.Tpo $(DEPDIR)/sml.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocols/sml.c' object='sml.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sml.obj `if test -f 'protocols/sml.c'; then $(CYGPATH_W) 'protocols/sml.c'; else $(CYGPATH_W) '$(srcdir)/protocols/sml.c'; fi`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \

4
src/d0.c → src/protocols/d0.c
View file

@ -37,12 +37,12 @@
#include <ctype.h>
#include <sys/time.h>
/* socket */
/* socket */
#include <netdb.h>
#include <sys/socket.h>
#include "meter.h"
#include "d0.h"
#include "protocols/d0.h"
#include "obis.h"
#include "options.h"

2
src/exec.c → src/protocols/exec.c
View file

@ -27,7 +27,7 @@
#include <sys/time.h>
#include "meter.h"
#include "exec.h"
#include "protocols/exec.h"
#include "options.h"
int meter_init_exec(meter_t *mtr, list_t options) {

2
src/file.c → src/protocols/file.c
View file

@ -28,7 +28,7 @@
#include <errno.h>
#include "meter.h"
#include "file.h"
#include "protocols/file.h"
#include "options.h"
int meter_init_file(meter_t *mtr, list_t options) {

4
src/fluksov2.c → src/protocols/fluksov2.c
View file

@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License
* along with volkszaehler.org. If not, see <http://www.gnu.org/licenses/>.
*/
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@ -30,7 +30,7 @@
#include <unistd.h>
#include "meter.h"
#include "fluksov2.h"
#include "protocols/fluksov2.h"
#include "options.h"
int meter_init_fluksov2(meter_t *mtr, list_t options) {

2
src/random.c → src/protocols/random.c
View file

@ -32,7 +32,7 @@
#include <sys/time.h>
#include "meter.h"
#include "random.h"
#include "protocols/random.h"
#include "options.h"
int meter_init_random(meter_t *mtr, list_t options) {

2
src/s0.c → src/protocols/s0.c
View file

@ -31,7 +31,7 @@
#include <errno.h>
#include "meter.h"
#include "s0.h"
#include "protocols/s0.h"
#include "options.h"
int meter_init_s0(meter_t *mtr, list_t options) {

4
src/sml.c → src/protocols/sml.c
View file

@ -39,7 +39,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
/* socket */
/* socket */
#include <netdb.h>
#include <sys/socket.h>
@ -48,7 +48,7 @@
#include <sml/sml_transport.h>
#include "meter.h"
#include "sml.h"
#include "protocols/sml.h"
#include "obis.h"
#include "options.h"