Commit e029dc0d authored by Andrey Filippov's avatar Andrey Filippov

fixed .gitignore

parent 5c022bde
html/* html/*
.project attic/*
.cproject /.project
.externalToolBuilders /.cproject
.settings /.pydevproject
*.directory /.externalToolBuilders
/.settings
.directory
generated*
sysroots
bitbake-logs
\ No newline at end of file
PROGS = camogm PROGS = camogm
PHPFILES = camogmstate.php PHPSCRIPTS = camogmstate.php
CONFIGS = qt_source
SRCS = camogm.c camogm_ogm.c camogm_jpeg.c camogm_mov.c camogm_kml.c camogm_read.c index_list.c SRCS = camogm.c camogm_ogm.c camogm_jpeg.c camogm_mov.c camogm_kml.c camogm_read.c index_list.c
OBJS = camogm.o camogm_ogm.o camogm_jpeg.o camogm_mov.o camogm_kml.o camogm_read.o index_list.o OBJS = camogm.o camogm_ogm.o camogm_jpeg.o camogm_mov.o camogm_kml.o camogm_read.o index_list.o
#OBJS = $(SRC:.c=.o) #OBJS = $(SRC:.c=.o)
#CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel #CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel
CFLAGS += -Wall -I$(STAGING_DIR_HOST)/usr/include-uapi/elphel CFLAGS += -Wall -I$(STAGING_DIR_HOST)/usr/include-uapi
LDLIBS += -logg -pthread -lm LDLIBS += -logg -pthread -lm
INSTALL = install
INSTMODE = 0755
INSTDOCS = 0644
OWN = -o root -g root
SYSCONFDIR = /etc/ SYSCONFDIR = /etc/
BINDIR = /usr/bin/ BINDIR = /usr/bin/
WWW_PAGES = /www/pages WWW_PAGES = /www/pages
all: $(PROGS) all: $(PROGS)
$(PROGS): $(OBJS) $(PROGS): $(OBJS)
$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
install: install: $(PROGS) $(PHPSCRIPTS) $(CONFIGS)
install -d $(DESTDIR)$(BINDIR) $(INSTALL) $(OWN) -d $(DESTDIR)$(BINDIR)
install -m 0755 -t $(DESTDIR)$(BINDIR) $(PROGS) $(INSTALL) $(OWN) -m $(INSTMODE) $(PROGS) $(DESTDIR)$(BINDIR)
install -d $(DESTDIR)$(SYSCONFDIR) $(INSTALL) $(OWN) -d $(DESTDIR)$(SYSCONFDIR)
install -m 0644 -t $(DESTDIR)$(SYSCONFDIR) $(CONFIGS) $(INSTALL) $(OWN) -m $(INSTDOCS) $(CONFIGS) $(DESTDIR)$(SYSCONFDIR)
$(INSTALL) $(OWN) -d $(DESTDIR)$(WWW_PAGES)
$(INSTALL) $(OWN) -m $(INSTMODE) $(PHPSCRIPTS) $(DESTDIR)$(WWW_PAGES)
clean: clean:
rm -rf $(PROGS) *.o *~ rm -rf $(PROGS) *.o *~
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#include <pthread.h> #include <pthread.h>
#include <stdbool.h> #include <stdbool.h>
#include <exifa.h>
#include <c313a.h>
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include "ogmstreams.h" #include "ogmstreams.h"
#include <x393_devices.h> #include <elphel/exifa.h>
#include <elphel/c313a.h>
#include <elphel/x393_devices.h>
#define CAMOGM_FRAME_NOT_READY 1 ///< frame pointer valid, but not yet acquired #define CAMOGM_FRAME_NOT_READY 1 ///< frame pointer valid, but not yet acquired
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment