Code: Select all
--- src/Makefile.am.orig 2011-01-22 00:09:46.000000000 +0200
+++ src/Makefile.am 2011-07-06 08:00:50.000000000 +0300
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = gnu
-AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
+AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@
#AM_CXXFLAGS = -frepo
CLEANFILES = *.rpo
@@ -36,7 +36,7 @@
zm_ffmpeg_camera.cpp \
zm_image.cpp \
zm_jpeg.c \
- zm_local_camera.cpp \
+ zm_fbsd_camera.cpp \
zm_monitor.cpp \
zm_ffmpeg.cpp \
zm_mpeg.cpp \
@@ -89,7 +89,7 @@
zm.h \
zm_image.h \
zm_jpeg.h \
- zm_local_camera.h \
+ zm_fbsd_camera.h \
zm_mem_utils.h \
zm_monitor.h \
zm_ffmpeg.h \
Code: Select all
--- src/Makefile.in.orig 2011-07-06 08:01:02.000000000 +0300
+++ src/Makefile.in 2011-07-06 08:01:43.000000000 +0300
@@ -54,7 +54,7 @@
zm_coord.$(OBJEXT) zm.$(OBJEXT) zm_db.$(OBJEXT) \
zm_debug.$(OBJEXT) zm_event.$(OBJEXT) zm_exception.$(OBJEXT) \
zm_file_camera.$(OBJEXT) zm_ffmpeg_camera.$(OBJEXT) \
- zm_image.$(OBJEXT) zm_jpeg.$(OBJEXT) zm_local_camera.$(OBJEXT) \
+ zm_image.$(OBJEXT) zm_jpeg.$(OBJEXT) zm_fbsd_camera.$(OBJEXT) \
zm_monitor.$(OBJEXT) zm_ffmpeg.$(OBJEXT) zm_mpeg.$(OBJEXT) \
zm_poly.$(OBJEXT) zm_regexp.$(OBJEXT) \
zm_remote_camera.$(OBJEXT) zm_remote_camera_http.$(OBJEXT) \
@@ -271,7 +271,7 @@
zm_ffmpeg_camera.cpp \
zm_image.cpp \
zm_jpeg.c \
- zm_local_camera.cpp \
+ zm_fbsd_camera.cpp \
zm_monitor.cpp \
zm_ffmpeg.cpp \
zm_mpeg.cpp \
@@ -323,7 +323,7 @@
zm.h \
zm_image.h \
zm_jpeg.h \
- zm_local_camera.h \
+ zm_fbsd_camera.h \
zm_mem_utils.h \
zm_monitor.h \
zm_ffmpeg.h \
@@ -470,7 +470,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_file_camera.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_image.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_jpeg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_local_camera.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_fbsd_camera.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_monitor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_mpeg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm_poly.Po@am__quote@