X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ffindobject%2FMakefile;h=7d37d82d6489fe6da4b7c58b821ab496db9c3aeb;hb=6312e51ae978bac56b9c1ba8dfd31dd7fd99c704;hp=c82a1414da82ac0324ba88ac1359f8132a15f5c0;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/findobject/Makefile b/cinelerra-5.1/plugins/findobject/Makefile
index c82a1414..7d37d82d 100644
--- a/cinelerra-5.1/plugins/findobject/Makefile
+++ b/cinelerra-5.1/plugins/findobject/Makefile
@@ -1,37 +1,21 @@
-include ../../global_config
+default: all
 
-OPENCV_DIR := $(shell cd ../../thirdparty/OpenCV*; pwd)
+TOPDIR?=../..
+include $(TOPDIR)/plugin_defs
+
+PLUGIN = findobject
 
 OBJS := \
 	$(OBJDIR)/findobject.o \
 	$(OBJDIR)/findobjectwindow.o \
-	$(OBJDIR)/surfscan.o \
-
-ifeq ($(STATIC_LIBRARIES), y)
-LFLAGS += $(OPENCV_DIR)/libopencv.a
-else
-LFLAGS += -lopencv_video
-LFLAGS += -lopencv_legacy
-endif
-
-CFLAGS += -I$(OPENCV_DIR)/modules/core/include/ \
-	-I$(OPENCV_DIR)/modules/features2d/include/ \
-	-I$(OPENCV_DIR)/modules/calib3d/include/ \
-	-I$(OPENCV_DIR)/modules/flann/include/ \
-	-I$(OPENCV_DIR)/modules/imgproc/include/ \
-	-I$(OPENCV_DIR)/modules/legacy/include/ \
-	-I$(OPENCV_DIR)/modules/highgui/include/ \
-	-I$(OPENCV_DIR)/modules/objdetect/include/ \
-	-I$(OPENCV_DIR)/modules/video/include/
 
-PLUGIN = findobject
+want_var:=$(WANT_FINDOBJECT)
+include $(TOPDIR)/opencv_build
+include $(TOPDIR)/plugin_config
 
-include ../../plugin_config
+all:	opencv
+	+make $(OUTPUT)
 
 $(OBJDIR)/findobject.o: findobject.C findobject.h findobjectwindow.h
 $(OBJDIR)/findobjectwindow.o: findobjectwindow.C findobject.h findobjectwindow.h
-$(OBJDIR)/surfscan.o: surfscan.C
-
-
-