# The top-level input Makefile for OpenCV
-# use the default c++ flags
-AM_CXXFLAGS=@DEF_CXXFLAGS@
-
-# tell make where aclocal finds its files in Maintainer Mode
-ACLOCAL_AMFLAGS = -I ./autotools/aclocal
+# tell make where aclocal finds its files in Maintainer Mode
+ACLOCAL_AMFLAGS = -I autotools/aclocal
## Any directories that you want built and installed should go here.
if BUILD_APPS
else
APPS_DIR =
endif
-SUBDIRS = cxcore cv cvaux ml otherlibs utils interfaces $(APPS_DIR) tests samples data docs
+SUBDIRS = 3rdparty src include utils interfaces $(APPS_DIR) tests samples data
# All the rest of the distributed files
-#EXTRA_DIST = THANKS COPYING INSTALL README NEWS ChangeLog \
-EXTRA_DIST = THANKS TODO \
- opencv.spec opencv.spec.in opencv.pc.in opencv.pc \
- _make apps filters make_frameworks.sh
+EXTRA_DIST = \
+ THANKS \
+ TODO \
+ opencv.spec \
+ opencv.spec.in \
+ opencv.pc \
+ opencv.pc.in \
+ \
+ make_frameworks.sh \
+ autotools/darwin/Info.plist \
+ autotools/darwin/OpenCV.h \
+ \
+ CMakeLists.txt \
+ opencv.pc.cmake.in \
+ Package.cmake.in \
+ cmake_uninstall.cmake.in \
+ OpenCVConfig.cmake.in \
+ OpenCVFindPkgConfig.cmake \
+ OpenCVPCHSupport.cmake \
+ cvconfig.h.cmake \
+ \
+ doc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = opencv.pc
-# The directory where the include files will be installed
-libcvincludedir = $(includedir)/opencv
-
-# Which header files to install
-libcvinclude_HEADERS =
-
# Rule to build tar-gzipped distribution package
$(PACKAGE)-$(VERSION).tar.gz: dist
dist-hook:
- rm -rf `find $(distdir) -name CVS`
- chmod u+x $(srcdir)/utils/unix2dos.py
- find $(distdir) -name *.dsw -exec $(srcdir)/utils/unix2dos.py {} \;
- find $(distdir) -name *.dsp -exec $(srcdir)/utils/unix2dos.py {} \;
+ rm -rf `find $(distdir) -name .svn`
# Rule to build RPM distribution package
rpm: $(PACKAGE)-$(VERSION).tar.gz
rpm -ta $(PACKAGE)-$(VERSION).tar.gz
-# Rule to force automake to rebuild the library
-changed:
- @echo "This build target is no longer necessary"
-
# Rule to install the libraries only - prevent rebuilding apps
install-lib:
cd src && $(MAKE) install-libLTLIBRARIES
# It currently creates a private framework (see Apple documentation) that
# cannot be placed to the /Library/Framework locations but is intended to get
# copied into application bundles.
-#
+#
# You should usually not invoke this target directly but use the shell script
# 'make_frameworks.sh' instead that will create the most sensible
# default installation (universal build).
-#
+#
# See: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/
-#
+#
FRAMEWORK_NAME = OpenCV
-FRAMEWORK_VERSION = A
-FRAMEWORK_CURRENT_VERSION = 1
-FRAMEWORK_COMPAT_VERSION = 1
+FRAMEWORK_VERSION = B
+FRAMEWORK_CURRENT_VERSION = 0
+FRAMEWORK_COMPAT_VERSION = 0
# install path to be set in calling script
# FRAMEWORK_INSTALL_PATH = executable_path/../Frameworks
FRAMEWORK_XHEADERS = \
$(top_srcdir)/autotools/darwin/OpenCV.h \
- $(top_srcdir)/cxcore/include/cxcore.h \
- $(top_srcdir)/cxcore/include/cxerror.h \
- $(top_srcdir)/cxcore/include/cxtypes.h \
- $(top_srcdir)/cxcore/include/cxmisc.h \
- $(top_srcdir)/cxcore/include/cxcore.hpp \
- $(top_srcdir)/cxcore/include/cvver.h \
- $(top_srcdir)/cv/include/cv.h \
- $(top_srcdir)/cv/include/cvcompat.h \
- $(top_srcdir)/cv/include/cvtypes.h \
- $(top_srcdir)/cv/include/cv.hpp \
- $(top_srcdir)/cvaux/include/cvaux.h \
- $(top_srcdir)/cvaux/include/cvmat.hpp \
- $(top_srcdir)/cvaux/include/cvaux.hpp \
- $(top_srcdir)/cvaux/include/cvvidsurv.hpp \
- $(top_srcdir)/ml/include/ml.h \
- $(top_srcdir)/otherlibs/highgui/highgui.h
+ $(top_srcdir)/include/opencv/cv.h \
+ $(top_srcdir)/include/opencv/cv.hpp \
+ $(top_srcdir)/include/opencv/cvaux.h \
+ $(top_srcdir)/include/opencv/cvaux.hpp \
+ $(top_srcdir)/include/opencv/cvcompat.h \
+ $(top_srcdir)/include/opencv/cvstreams.h \
+ $(top_srcdir)/include/opencv/cvtypes.h \
+ $(top_srcdir)/include/opencv/cvver.h \
+ $(top_srcdir)/include/opencv/cvvidsurv.hpp \
+ $(top_srcdir)/include/opencv/cvwimage.h \
+ $(top_srcdir)/include/opencv/cxcore.h \
+ $(top_srcdir)/include/opencv/cxcore.hpp \
+ $(top_srcdir)/include/opencv/cxerror.h \
+ $(top_srcdir)/include/opencv/cxflann.h \
+ $(top_srcdir)/include/opencv/cxmat.hpp \
+ $(top_srcdir)/include/opencv/cxmisc.h \
+ $(top_srcdir)/include/opencv/cxoperations.hpp \
+ $(top_srcdir)/include/opencv/cxtypes.h \
+ $(top_srcdir)/include/opencv/highgui.h \
+ $(top_srcdir)/include/opencv/highgui.hpp \
+ $(top_srcdir)/include/opencv/ml.h
+
FRAMEWORK_OFILES = \
- $(top_builddir)/cxcore/src/.libs/lib_cxcore.a \
- $(top_builddir)/cv/src/.libs/lib_cv.a \
- $(top_builddir)/cvaux/src/.libs/lib_cvaux.a \
- $(top_builddir)/ml/src/.libs/lib_ml.a \
- $(top_builddir)/otherlibs/highgui/.libs/lib_highgui.a
+ $(top_builddir)/3rdparty/.libs/lib_clapack.a \
+ $(top_builddir)/3rdparty/.libs/lib_flann.a \
+ $(top_builddir)/src/.libs/lib_cxcore.a \
+ $(top_builddir)/src/.libs/lib_cv.a \
+ $(top_builddir)/src/.libs/lib_cvaux.a \
+ $(top_builddir)/src/.libs/lib_ml.a \
+ $(top_builddir)/src/.libs/lib_highgui.a
-FRAMEWORK_XLIBRARIES = -framework Carbon -framework QuickTime -framework QuartzCore
+FRAMEWORK_XLIBRARIES = -lz -framework Carbon -framework QuickTime -framework QuartzCore
-FRAMEWORK_DOCUMENTATION = \
- $(top_srcdir)/docs/license.txt \
- $(top_srcdir)/docs/index.htm \
- $(top_srcdir)/docs/faq.htm \
- $(top_srcdir)/docs/ref
+FRAMEWORK_DOCUMENTATION =
+#\
+# $(top_srcdir)/doc/license.txt \
+# $(top_srcdir)/doc/index.htm \
+# $(top_srcdir)/doc/faq.htm \
+# $(top_srcdir)/doc/ref
-FMWK_CC = g++ -dynamiclib -all_load -Wl,-single_module -Wl,-Y,100
+FMWK_CC = g++-4.2 -fopenmp -dynamiclib -all_load -Wl,-single_module -Wl,-Y,100
framework: all clean-framework
@echo "Setting up framework directories..."
$(FRAMEWORK_OFILES) $(FRAMEWORK_XLIBRARIES)
strip -x $(FRAMEWORK_NAME).framework/Versions/Current/$(FRAMEWORK_NAME)
cp $(FRAMEWORK_XHEADERS) $(FRAMEWORK_NAME).framework/Headers/
- cp -r $(FRAMEWORK_DOCUMENTATION) $(FRAMEWORK_NAME).framework/Documentation/
cp $(top_srcdir)/autotools/darwin/Info.plist $(FRAMEWORK_NAME).framework/Resources/
+# cp -r $(FRAMEWORK_DOCUMENTATION) $(FRAMEWORK_NAME).framework/Documentation/
+
clean-framework:
- rm -rf $(FRAMEWORK_NAME).framework
+ rm -rf $(FRAMEWORK_NAME).framework build_i386 build_ppc build_x86_64 build_ppc64
projects / opencv / blobdiff