moved sources to src

.gitignore

 *.o
+*.kate-swp
 attic/*
 /.project
 /.cproject
 /.pydevproject
 /.externalToolBuilders
 /.settings
+/image
 .directory
+.depend
 generated*
 sysroots
 bitbake-logs

Makefile

-PROGS      = autocampars launch_php_script
-PHPSCRIPTS = autocampars.php
-SRCS       = autocampars.c launch_php_script.c
-#OBJS =       $(SRC:.c=.o)
-OBJS       = autocampars.o launch_php_script.o
+# Runs 'make', 'make install', and 'make clean' in specified subdirectories
+SUBDIRS := src
+INSTALLDIRS = $(SUBDIRS:%=install-%)
+CLEANDIRS =   $(SUBDIRS:%=clean-%)
 
+#TARGETDIR=$(DESTDIR)/www/pages
 
-BINDIR       = $(DESTDIR)/usr/bin
-SYSCONFDIR   = $(DESTDIR)/etc
-CONFDIR      = $(SYSCONFDIR)/elphel393
-DOCUMENTROOT = $(DESTDIR)/www/pages
-AUTOCAMPARS_PHP = /www/pages/autocampars.php
+all: $(SUBDIRS)
+	@echo "make all top"
 
-INSTALL    = install
-INSTMODE   = 0755
-INSTDOCS   = 0644
-OWN =        -o root -g root
+$(SUBDIRS):
+	$(MAKE) -C $@
 
-INCDIR     = $(STAGING_DIR_HOST)/usr/include-uapi
-#CFLAGS   += -Wall -I$(INCDIR)
-CFLAGS   += -Wall -I$(STAGING_DIR_HOST)/usr/include-uapi -D 'AUTOCAMPARS_PHP="$(AUTOCAMPARS_PHP)"'
+install: $(INSTALLDIRS)
+	@echo "make install top"
 
-all: $(PROGS)
+$(INSTALLDIRS): 
+	$(MAKE) -C $(@:install-%=%) install
 
-#$(PROGS): $(OBJS)
-#	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+clean: $(CLEANDIRS)
+	@echo "make clean top"
 
-autocampars: autocampars.o
-	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
-	@echo "AUTOCAMPARS_PHP=$(AUTOCAMPARS_PHP)"
+$(CLEANDIRS): 
+	$(MAKE) -C $(@:clean-%=%) clean
 
-launch_php_script: launch_php_script.o
-	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
-	
-
-install: $(PROGS) $(PHPSCRIPTS)
-	$(INSTALL) -d $(BINDIR)
-	$(INSTALL) -d $(DOCUMENTROOT)
-	$(INSTALL) -d $(SYSCONFDIR)
-	$(INSTALL) -d $(CONFDIR)
-	$(INSTALL) $(OWN) -m $(INSTMODE) $(PROGS) $(BINDIR)
-	$(INSTALL) $(OWN) -m $(INSTMODE) $(PHPSCRIPTS) $(DOCUMENTROOT)
-
-clean:
-	rm -rf $(PROGS) *.o core
-configsubs:
+.PHONY: all install clean $(SUBDIRS) $(INSTALLDIRS) $(CLEANDIRS)
 

src/Makefile

+PROGS      = autocampars launch_php_script
+PHPSCRIPTS = autocampars.php
+SRCS       = autocampars.c launch_php_script.c
+#OBJS =       $(SRC:.c=.o)
+OBJS       = autocampars.o launch_php_script.o
+
+
+BINDIR       = $(DESTDIR)/usr/bin
+SYSCONFDIR   = $(DESTDIR)/etc
+CONFDIR      = $(SYSCONFDIR)/elphel393
+DOCUMENTROOT = $(DESTDIR)/www/pages
+AUTOCAMPARS_PHP = /www/pages/autocampars.php
+
+INSTALL    = install
+INSTMODE   = 0755
+INSTDOCS   = 0644
+OWN =        -o root -g root
+
+INCDIR     = $(STAGING_DIR_HOST)/usr/include-uapi
+#CFLAGS   += -Wall -I$(INCDIR)
+CFLAGS   += -Wall -I$(STAGING_DIR_HOST)/usr/include-uapi -D 'AUTOCAMPARS_PHP="$(AUTOCAMPARS_PHP)"'
+
+all: $(PROGS)
+
+#$(PROGS): $(OBJS)
+#	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
+autocampars: autocampars.o
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+	@echo "AUTOCAMPARS_PHP=$(AUTOCAMPARS_PHP)"
+   
+launch_php_script: launch_php_script.o
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+	
+
+install: $(PROGS) $(PHPSCRIPTS)
+	$(INSTALL) -d $(BINDIR)
+	$(INSTALL) -d $(DOCUMENTROOT)
+	$(INSTALL) -d $(SYSCONFDIR)
+	$(INSTALL) -d $(CONFDIR)
+	$(INSTALL) $(OWN) -m $(INSTMODE) $(PROGS) $(BINDIR)
+	$(INSTALL) $(OWN) -m $(INSTMODE) $(PHPSCRIPTS) $(DOCUMENTROOT)
+
+clean:
+	rm -rf $(PROGS) *.o core
+configsubs:
+
+depend: .depend
+
+.depend: $(SRCS)
+	rm -f ./.depend
+	$(CC) $(CFLAGS) -MM $^ > ./.depend;
+
+include .depend

autocampars.php → src/autocampars.php

@@ -432,7 +432,7 @@ function sync2master($timeout=120,$min_frame_master=30) {
 
   if (!file_exists('/var/state/APPLICATION') || !file_exists('/var/state/APPLICATION_MODE')) return -1; 
   $application=     file_get_contents('/var/state/APPLICATION');
-  $IP_shift=(file_get_contents('/var/state/APPLICATION_MODE')+0) % 100; // 0 - SINGLE, 1..3 - Eyesis, 101+ Eyesis4pi
+  $IP_shift=(file_get_contents('/var/state/APPLICATION_MODE')+0) % 100; // 0 - SINGLE, 1..3 - Eyesis, 101+ Eyesis4pi, 1001..1003 - E4pi393
   if ($application!='EYESIS') return 0; /// not supported yet
   if ($IP_shift==1) return 0;   /// it is the master (101 will also get here)
   $neteth0=file('/etc/conf.d/net.eth0');