Fixed some dependencies

edrosten · Apr 10, 2008 · f37dfda · f37dfda
1 parent d286a79
commit f37dfda
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -102,7 +102,6 @@ CVD_OBJS=   cvd_src/cvd_timer.o                             \
 			cvd_src/nonmax_suppression.o                    \
 			cvd_src/timeddiskbuffer.o                       \
 			cvd_src/videosource.o                           \
-			cvd_src/tensor_voting.o                         \
 			@dep_objects@
 
 ################################################################################

diff --git a/configure b/configure
@@ -3517,6 +3517,8 @@ CXXFLAGS="$CXXFLAGS -I "$(eval echo $includedir)""
 #
 CXXFLAGS="$(echo "$CXXFLAGS" | sed -e's/-O2//')"
 
+echo $CXXFLAGS
+
 ########################################
 #
 # Extra debugging
@@ -10270,7 +10272,7 @@ cvd_src/slower_corner_12						fast12							END
 #General OS specific bits
 cvd_src/Linux/dvbuffer							dvbuffer END
 cvd_src/Linux/v4l1buffer						v4l1buffer END
-cvd_src/Linux/v4lbuffer							v4l1buffer END
+cvd_src/Linux/v4lbuffer							v4l1buffer v4l2buffer END
 cvd_src/Linux/v4l2buffer	                 	v4l2buffer END
 cvd_src/IRIX/O2buffer,cvd_src/IRIX/sgi-video	o2buffer END
 cvd_src/OSX/qtbuffer							qtbuffer END
@@ -10284,6 +10286,9 @@ pnm_src/png										png END
 cvd_src/videofilebuffer							ffmpeg END
 cvd_src/globlist    							glob END
 
+#Numerics dependencies
+cvd_src/tensor_voting.cc						toon END
+
 ENDDEPS
 
 #Split in to object files and defines

diff --git a/configure.in b/configure.in
@@ -830,7 +830,7 @@ cvd_src/slower_corner_12						fast12							END
 #General OS specific bits
 cvd_src/Linux/dvbuffer							dvbuffer END
 cvd_src/Linux/v4l1buffer						v4l1buffer END
-cvd_src/Linux/v4lbuffer							v4l1buffer END
+cvd_src/Linux/v4lbuffer							v4l1buffer v4l2buffer END
 cvd_src/Linux/v4l2buffer	                 	v4l2buffer END
 cvd_src/IRIX/O2buffer,cvd_src/IRIX/sgi-video	o2buffer END
 cvd_src/OSX/qtbuffer							qtbuffer END
@@ -844,6 +844,9 @@ pnm_src/png										png END
 cvd_src/videofilebuffer							ffmpeg END
 cvd_src/globlist    							glob END
 
+#Numerics dependencies
+cvd_src/tensor_voting.cc						toon END
+
 ENDDEPS
 
 #Split in to object files and defines