Subversion Repositories emg2

Compare Revisions

Ignore whitespace Rev 390 → Rev 391

/src/config.c
68,7 → 68,6
int ret;
int l;
 
printf("path=<%s>\n", path);
check = g_file_get_contents(path, &contents, &length, &error);
if(check == FALSE)
{
/src/Makefile.in
75,10 → 75,10
emg-glue.$(OBJEXT) emg-config.$(OBJEXT) \
emg-broadcast.$(OBJEXT) emg-uuid.$(OBJEXT) emg-name.$(OBJEXT) \
emg-hotplug.$(OBJEXT) emg-reports.$(OBJEXT) \
emg-sysinfos.$(OBJEXT) emg-vars.$(OBJEXT) \
emg-signals.$(OBJEXT) emg-autosave.$(OBJEXT) \
emg-xmalloc.$(OBJEXT) emg-getopt.$(OBJEXT) \
emg-getopt1.$(OBJEXT)
emg-sysinfos.$(OBJEXT) emg-readline.$(OBJEXT) \
emg-vars.$(OBJEXT) emg-signals.$(OBJEXT) \
emg-autosave.$(OBJEXT) emg-xmalloc.$(OBJEXT) \
emg-getopt.$(OBJEXT) emg-getopt1.$(OBJEXT)
emg_OBJECTS = $(am_emg_OBJECTS)
emg_DEPENDENCIES =
emg_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(emg_LDFLAGS) $(LDFLAGS) -o \
231,6 → 231,7
hotplug.c hotplug.h \
reports.c reports.h \
sysinfos.c sysinfos.h \
readline.c readline.h \
vars.c vars.h \
signals.c signals.h \
autosave.c autosave.h \
342,6 → 343,7
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emg-plugin_plscnt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emg-plugin_tiedf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emg-plugins.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emg-readline.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emg-reports.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emg-signals.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emg-socket.Po@am__quote@
732,6 → 734,20
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(emg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o emg-sysinfos.obj `if test -f 'sysinfos.c'; then $(CYGPATH_W) 'sysinfos.c'; else $(CYGPATH_W) '$(srcdir)/sysinfos.c'; fi`
 
emg-readline.o: readline.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(emg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT emg-readline.o -MD -MP -MF $(DEPDIR)/emg-readline.Tpo -c -o emg-readline.o `test -f 'readline.c' || echo '$(srcdir)/'`readline.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/emg-readline.Tpo $(DEPDIR)/emg-readline.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='readline.c' object='emg-readline.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(emg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o emg-readline.o `test -f 'readline.c' || echo '$(srcdir)/'`readline.c
 
emg-readline.obj: readline.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(emg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT emg-readline.obj -MD -MP -MF $(DEPDIR)/emg-readline.Tpo -c -o emg-readline.obj `if test -f 'readline.c'; then $(CYGPATH_W) 'readline.c'; else $(CYGPATH_W) '$(srcdir)/readline.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/emg-readline.Tpo $(DEPDIR)/emg-readline.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='readline.c' object='emg-readline.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(emg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o emg-readline.obj `if test -f 'readline.c'; then $(CYGPATH_W) 'readline.c'; else $(CYGPATH_W) '$(srcdir)/readline.c'; fi`
 
emg-vars.o: vars.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(emg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT emg-vars.o -MD -MP -MF $(DEPDIR)/emg-vars.Tpo -c -o emg-vars.o `test -f 'vars.c' || echo '$(srcdir)/'`vars.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/emg-vars.Tpo $(DEPDIR)/emg-vars.Po
/misc/db/interfaces.cfg
1,10 → 1,6
/dev/ttyS0,teleinfo1,00000000000000000000,EDF
192.168.0.11,gce-ipx800,00000000000000000000,PULSAR
192.168.0.12,gce-ipx800,00000000000000000000,DMM
/usr/local/var/lib/tiedf,teleinfo,00000000000000000000,EDF
/dev/null,null,00000000000000000000,NULL
/dev/ttyACM0,emg-msc,64933303237351E06030,MSC
/dev/ttyUSB0,cc-envir,00000000000000000000,ENVIR
/usr/local/var/lib/plscnt,plscnt,00000000000000000000,PLSCNT
/usr/local/var/lib/eon/018A75BA,eon,00000000000000000000,UBID
/usr/local/var/lib/eon/FEFEE211,eon,00000000000000000000,ROCKER