- fixed autotools issues found by 'make distcheck'

git-svn-id: https://code.ros.org/svn/opencv/trunk@722 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/interfaces/swig/Makefile.am b/opencv/interfaces/swig/Makefile.am
index faac61ecf83e55154fd5c7642a9761239f0ff5a3..a0cc674f29a6e11942a19b13600a547129ed7349 100644 (file)
--- a/opencv/interfaces/swig/Makefile.am
+++ b/opencv/interfaces/swig/Makefile.am
@@ -14,7 +14,3 @@ AM_CPPFLAGS = \
   -DCV_NO_BACKWARD_COMPATIBILITY
 
 SUBDIRS = filtered general python
-
-# remove non-wanted files in the archive
-dist-hook:
-       rm -f `find $(distdir)/general/ ! -name '*.i' -type f`

diff --git a/opencv/interfaces/swig/Makefile.in b/opencv/interfaces/swig/Makefile.in
index 67727bef57f26f848b2cb1637091134c69c04ca6..397c671eb2afe8454fcece44509d2633f82f7e4e 100644 (file)
--- a/opencv/interfaces/swig/Makefile.in
+++ b/opencv/interfaces/swig/Makefile.in
@@ -455,9 +455,6 @@ distdir: $(DISTFILES)
              || exit 1; \
          fi; \
        done
-       $(MAKE) $(AM_MAKEFLAGS) \
-         top_distdir="$(top_distdir)" distdir="$(distdir)" \
-         dist-hook
 check-am: all-am
 check: check-recursive
 all-am: Makefile
@@ -538,21 +535,17 @@ uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
        clean clean-generic clean-libtool clean-recursive ctags \
-       ctags-recursive dist-hook distclean distclean-generic \
-       distclean-libtool distclean-recursive distclean-tags distdir \
-       dvi dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-exec install-exec-am \
-       install-info install-info-am install-man install-strip \
-       installcheck installcheck-am installdirs installdirs-am \
-       maintainer-clean maintainer-clean-generic \
-       maintainer-clean-recursive mostlyclean mostlyclean-generic \
-       mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-       tags tags-recursive uninstall uninstall-am uninstall-info-am
-
-
-# remove non-wanted files in the archive
-dist-hook:
-       rm -f `find $(distdir)/general/ ! -name '*.i' -type f`
+       ctags-recursive distclean distclean-generic distclean-libtool \
+       distclean-recursive distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic maintainer-clean-recursive \
+       mostlyclean mostlyclean-generic mostlyclean-libtool \
+       mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+       uninstall uninstall-am uninstall-info-am
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/opencv/interfaces/swig/filtered/Makefile.am b/opencv/interfaces/swig/filtered/Makefile.am
index 4a806c1cf95a7668bcbf2895225be24ff72cb684..85e8db03a6fd90a52fba44e1bfc74b2fea3919a1 100644 (file)
--- a/opencv/interfaces/swig/filtered/Makefile.am
+++ b/opencv/interfaces/swig/filtered/Makefile.am
@@ -1,3 +1,4 @@
+
 # opencv/interfaces/swig/filtered/Makefile.am
 # 2005-05-07, Mark Asbach <asbach@ient.rwth-aachen.de>
 
@@ -15,35 +16,27 @@ AM_CPPFLAGS = \
 
 EXTRA_DIST = cv.h constants.h
 
-distcleancheck_listfiles = \
-  find -type f -exec sh -c 'test -f $(scrdir)/{} || echo {}'
 
 # SWIG ###############################################################################
 
 # the following rules keep wrappers up to date, if SWIG is present
 if UPDATE_SWIG_WRAPPERS
 
-# a work-around to force the build of cv.h and constants.h
-# maybe there is a better way...
-noinst_SCRIPTS = headers_generated
-headers_generated: cv.h constants.h
-       touch headers_generated
-MOSTLYCLEANFILES = headers_generated
-
 # this rule creates a single SWIG parseable header from cv.h and cxcore.h, etc.
-cv.h:
-       $(top_srcdir)/cv/include/cv.h \
-       $(top_srcdir)/cv/include/cvtypes.h \
-       $(top_srcdir)/cxcore/include/cxcore.h \
-       $(top_srcdir)/cxcore/include/cvver.h \
-       $(top_srcdir)/cxcore/include/cxtypes.h \
-       $(top_srcdir)/cxcore/include/cxerror.h Makefile
+cv.h: \
+  $(top_srcdir)/cv/include/cv.h \
+  $(top_srcdir)/cv/include/cvtypes.h \
+  $(top_srcdir)/cxcore/include/cxcore.h \
+  $(top_srcdir)/cxcore/include/cvver.h \
+  $(top_srcdir)/cxcore/include/cxtypes.h \
+  $(top_srcdir)/cxcore/include/cxerror.h Makefile.in
        $(CPP) -x c++ -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) -DSKIP_INCLUDES -o $@ $(top_srcdir)/cv/include/cv.h
 
 # this rule creates a single SWIG parseable header from cv.h and cxcore.h, etc.
-constants.h: $(top_srcdir)/cv/include/cv.h $(top_srcdir)/cv/include/cvtypes.h \
-             $(top_srcdir)/cxcore/include/cxcore.h $(top_srcdir)/cxcore/include/cxtypes.h \
-             $(top_srcdir)/cxcore/include/cxerror.h Makefile
+constants.h: \
+  $(top_srcdir)/cv/include/cv.h $(top_srcdir)/cv/include/cvtypes.h \
+  $(top_srcdir)/cxcore/include/cxcore.h $(top_srcdir)/cxcore/include/cxtypes.h \
+  $(top_srcdir)/cxcore/include/cxerror.h Makefile.in
        $(PYTHON) $(top_srcdir)/utils/extract_constants.py $(top_srcdir)/cxcore/include/cxcore.h   > $@
        $(PYTHON) $(top_srcdir)/utils/extract_constants.py $(top_srcdir)/cxcore/include/cvver.h   >> $@
        $(PYTHON) $(top_srcdir)/utils/extract_constants.py $(top_srcdir)/cxcore/include/cxtypes.h >> $@

diff --git a/opencv/interfaces/swig/filtered/Makefile.in b/opencv/interfaces/swig/filtered/Makefile.in
index 77cebda427f8a6afbe880b3c47d5f99f4e24a7c0..ac432cf88a26c1e035e03fbb59244e0e37d56388 100644 (file)
--- a/opencv/interfaces/swig/filtered/Makefile.in
+++ b/opencv/interfaces/swig/filtered/Makefile.in
@@ -19,7 +19,6 @@
 
 # depending on the Automake conditionals set by configure, we will build the various
 # script language interfaces that SWIG is capable of generating wrappers for
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -56,7 +55,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/cvconfig.h
 CONFIG_CLEAN_FILES =
-SCRIPTS = $(noinst_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -231,18 +229,6 @@ AM_CPPFLAGS = \
   -DCV_NO_BACKWARD_COMPATIBILITY
 
 EXTRA_DIST = cv.h constants.h
-distcleancheck_listfiles = \
-  find -type f -exec sh -c 'test -f $(scrdir)/{} || echo {}'
-
-
-# SWIG ###############################################################################
-
-# the following rules keep wrappers up to date, if SWIG is present
-
-# a work-around to force the build of cv.h and constants.h
-# maybe there is a better way...
-@UPDATE_SWIG_WRAPPERS_TRUE@noinst_SCRIPTS = headers_generated
-@UPDATE_SWIG_WRAPPERS_TRUE@MOSTLYCLEANFILES = headers_generated
 all: all-am
 
 .SUFFIXES:
@@ -321,7 +307,7 @@ distdir: $(DISTFILES)
        done
 check-am: all-am
 check: check-am
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -338,7 +324,6 @@ install-strip:
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
 
@@ -404,23 +389,26 @@ uninstall-am: uninstall-info-am
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
        uninstall-info-am
 
-@UPDATE_SWIG_WRAPPERS_TRUE@headers_generated: cv.h constants.h
-@UPDATE_SWIG_WRAPPERS_TRUE@    touch headers_generated
+
+# SWIG ###############################################################################
+
+# the following rules keep wrappers up to date, if SWIG is present
 
 # this rule creates a single SWIG parseable header from cv.h and cxcore.h, etc.
-@UPDATE_SWIG_WRAPPERS_TRUE@cv.h:
-@UPDATE_SWIG_WRAPPERS_TRUE@    $(top_srcdir)/cv/include/cv.h \
-@UPDATE_SWIG_WRAPPERS_TRUE@    $(top_srcdir)/cv/include/cvtypes.h \
-@UPDATE_SWIG_WRAPPERS_TRUE@    $(top_srcdir)/cxcore/include/cxcore.h \
-@UPDATE_SWIG_WRAPPERS_TRUE@    $(top_srcdir)/cxcore/include/cvver.h \
-@UPDATE_SWIG_WRAPPERS_TRUE@    $(top_srcdir)/cxcore/include/cxtypes.h \
-@UPDATE_SWIG_WRAPPERS_TRUE@    $(top_srcdir)/cxcore/include/cxerror.h Makefile
+@UPDATE_SWIG_WRAPPERS_TRUE@cv.h: \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cv/include/cv.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cv/include/cvtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxcore.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cvver.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxerror.h Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(CPP) -x c++ -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) -DSKIP_INCLUDES -o $@ $(top_srcdir)/cv/include/cv.h
 
 # this rule creates a single SWIG parseable header from cv.h and cxcore.h, etc.
-@UPDATE_SWIG_WRAPPERS_TRUE@constants.h: $(top_srcdir)/cv/include/cv.h $(top_srcdir)/cv/include/cvtypes.h \
-@UPDATE_SWIG_WRAPPERS_TRUE@             $(top_srcdir)/cxcore/include/cxcore.h $(top_srcdir)/cxcore/include/cxtypes.h \
-@UPDATE_SWIG_WRAPPERS_TRUE@             $(top_srcdir)/cxcore/include/cxerror.h Makefile
+@UPDATE_SWIG_WRAPPERS_TRUE@constants.h: \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cv/include/cv.h $(top_srcdir)/cv/include/cvtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxcore.h $(top_srcdir)/cxcore/include/cxtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxerror.h Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(PYTHON) $(top_srcdir)/utils/extract_constants.py $(top_srcdir)/cxcore/include/cxcore.h   > $@
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(PYTHON) $(top_srcdir)/utils/extract_constants.py $(top_srcdir)/cxcore/include/cvver.h   >> $@
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(PYTHON) $(top_srcdir)/utils/extract_constants.py $(top_srcdir)/cxcore/include/cxtypes.h >> $@

diff --git a/opencv/interfaces/swig/filtered/cv.h b/opencv/interfaces/swig/filtered/cv.h
index d386992050df329ed0dabd8c5d19705751a3c810..60f98d4948a46c9edeaab8005cbfd9b082672e7c 100644 (file)
--- a/opencv/interfaces/swig/filtered/cv.h
+++ b/opencv/interfaces/swig/filtered/cv.h
@@ -924,10 +924,12 @@ CvModuleInfo;
 # 47 "../../../cxcore/include/cxerror.h"
 typedef int CVStatus;
 # 71 "../../../cxcore/include/cxcore.h" 2
+# 1 "../../../cxcore/include/cvver.h" 1
+# 72 "../../../cxcore/include/cxcore.h" 2
 
 
 extern "C" {
-# 84 "../../../cxcore/include/cxcore.h"
+# 85 "../../../cxcore/include/cxcore.h"
 extern "C" void* cvAlloc( size_t size );
 
 
@@ -1147,7 +1149,7 @@ typedef struct CvNArrayIterator
 
 }
 CvNArrayIterator;
-# 311 "../../../cxcore/include/cxcore.h"
+# 312 "../../../cxcore/include/cxcore.h"
 extern "C" int cvInitNArrayIterator( int count, CvArr** arrs,
                                  const CvArr* mask, CvMatND* stubs,
                                  CvNArrayIterator* array_iterator,
@@ -1227,7 +1229,7 @@ extern "C" CvMat* cvGetMat( const CvArr* arr, CvMat* header,
 
 
 extern "C" IplImage* cvGetImage( const CvArr* arr, IplImage* image_header );
-# 402 "../../../cxcore/include/cxcore.h"
+# 403 "../../../cxcore/include/cxcore.h"
 extern "C" CvArr* cvReshapeMatND( const CvArr* arr,
                              int sizeof_header, CvArr* header,
                              int new_cn, int new_dims, int* new_sizes );
@@ -1303,7 +1305,7 @@ extern "C" void cvMixChannels( const CvArr** src, int src_count,
 extern "C" void cvConvertScale( const CvArr* src, CvArr* dst,
                              double scale = 1,
                              double shift = 0 );
-# 487 "../../../cxcore/include/cxcore.h"
+# 488 "../../../cxcore/include/cxcore.h"
 extern "C" void cvConvertScaleAbs( const CvArr* src, CvArr* dst,
                                 double scale = 1,
                                 double shift = 0 );
@@ -1404,7 +1406,7 @@ extern "C" void cvInRange( const CvArr* src, const CvArr* lower,
 
 extern "C" void cvInRangeS( const CvArr* src, CvScalar lower,
                        CvScalar upper, CvArr* dst );
-# 599 "../../../cxcore/include/cxcore.h"
+# 600 "../../../cxcore/include/cxcore.h"
 extern "C" void cvCmp( const CvArr* src1, const CvArr* src2, CvArr* dst, int cmp_op );
 
 
@@ -1427,7 +1429,7 @@ extern "C" void cvAbsDiff( const CvArr* src1, const CvArr* src2, CvArr* dst );
 
 
 extern "C" void cvAbsDiffS( const CvArr* src, CvArr* dst, CvScalar value );
-# 629 "../../../cxcore/include/cxcore.h"
+# 630 "../../../cxcore/include/cxcore.h"
 extern "C" void cvCartToPolar( const CvArr* x, const CvArr* y,
                             CvArr* magnitude, CvArr* angle = NULL,
                             int angle_in_degrees = 0);
@@ -1486,7 +1488,7 @@ extern "C" int cvSolveCubic( const CvMat* coeffs, CvMat* roots );
 
 
 extern "C" void cvCrossProduct( const CvArr* src1, const CvArr* src2, CvArr* dst );
-# 697 "../../../cxcore/include/cxcore.h"
+# 698 "../../../cxcore/include/cxcore.h"
 extern "C" void cvGEMM( const CvArr* src1, const CvArr* src2, double alpha,
                      const CvArr* src3, double beta, CvArr* dst,
                      int tABC = 0);
@@ -1518,7 +1520,7 @@ extern "C" void cvTranspose( const CvArr* src, CvArr* dst );
 
 extern "C" void cvFlip( const CvArr* src, CvArr* dst = NULL,
                      int flip_mode = 0);
-# 736 "../../../cxcore/include/cxcore.h"
+# 737 "../../../cxcore/include/cxcore.h"
 extern "C" void cvSVD( CvArr* A, CvArr* W, CvArr* U = NULL,
                      CvArr* V = NULL, int flags = 0);
 
@@ -1556,7 +1558,7 @@ extern "C" void cvSetIdentity( CvArr* mat, CvScalar value = cvRealScalar(1) );
 
 
 extern "C" CvArr* cvRange( CvArr* mat, double start, double end );
-# 794 "../../../cxcore/include/cxcore.h"
+# 795 "../../../cxcore/include/cxcore.h"
 extern "C" void cvCalcCovarMatrix( const CvArr** vects, int count,
                                 CvArr* cov_mat, CvArr* avg, int flags );
 
@@ -1598,7 +1600,7 @@ extern "C" void cvMinMaxLoc( const CvArr* arr, double* min_val, double* max_val,
                           CvPoint* min_loc = NULL,
                           CvPoint* max_loc = NULL,
                           const CvArr* mask = NULL );
-# 853 "../../../cxcore/include/cxcore.h"
+# 854 "../../../cxcore/include/cxcore.h"
 extern "C" double cvNorm( const CvArr* arr1, const CvArr* arr2 = NULL,
                        int norm_type = 4,
                        const CvArr* mask = NULL );
@@ -1616,7 +1618,7 @@ extern "C" void cvNormalize( const CvArr* src, CvArr* dst,
 
 extern "C" void cvReduce( const CvArr* src, CvArr* dst, int dim = -1,
                        int op = 0 );
-# 887 "../../../cxcore/include/cxcore.h"
+# 888 "../../../cxcore/include/cxcore.h"
 extern "C" void cvDFT( const CvArr* src, CvArr* dst, int flags,
                     int nonzero_rows = 0 );
 
@@ -1916,7 +1918,7 @@ extern "C" void cvClearGraph( CvGraph* graph );
 
 extern "C" int cvGraphVtxDegree( const CvGraph* graph, int vtx_idx );
 extern "C" int cvGraphVtxDegreeByPtr( const CvGraph* graph, const CvGraphVtx* vtx );
-# 1221 "../../../cxcore/include/cxcore.h"
+# 1222 "../../../cxcore/include/cxcore.h"
 typedef struct CvGraphScanner
 {
     CvGraphVtx* vtx;
@@ -1943,7 +1945,7 @@ extern "C" int cvNextGraphItem( CvGraphScanner* scanner );
 
 
 extern "C" CvGraph* cvCloneGraph( const CvGraph* graph, CvMemStorage* storage );
-# 1268 "../../../cxcore/include/cxcore.h"
+# 1269 "../../../cxcore/include/cxcore.h"
 extern "C" void cvLine( CvArr* img, CvPoint pt1, CvPoint pt2,
                      CvScalar color, int thickness = 1,
                      int line_type = 8, int shift = 0 );
@@ -1993,7 +1995,7 @@ extern "C" void cvFillPoly( CvArr* img, CvPoint** pts, int* npts, int contours,
 extern "C" void cvPolyLine( CvArr* img, CvPoint** pts, int* npts, int contours,
                          int is_closed, CvScalar color, int thickness = 1,
                          int line_type = 8, int shift = 0 );
-# 1327 "../../../cxcore/include/cxcore.h"
+# 1328 "../../../cxcore/include/cxcore.h"
 extern "C" int cvClipLine( CvSize img_size, CvPoint* pt1, CvPoint* pt2 );
 
 
@@ -2003,7 +2005,7 @@ extern "C" int cvInitLineIterator( const CvArr* image, CvPoint pt1, CvPoint pt2,
                                 CvLineIterator* line_iterator,
                                 int connectivity = 8,
                                 int left_to_right = 0);
-# 1364 "../../../cxcore/include/cxcore.h"
+# 1365 "../../../cxcore/include/cxcore.h"
 typedef struct CvFont
 {
     int font_face;
@@ -2193,7 +2195,7 @@ extern "C" void cvSetIPLAllocators( Cv_iplCreateImageHeader create_header,
                                Cv_iplDeallocate deallocate,
                                Cv_iplCreateROI create_roi,
                                Cv_iplCloneImage clone_image );
-# 1565 "../../../cxcore/include/cxcore.h"
+# 1566 "../../../cxcore/include/cxcore.h"
 extern "C" CvFileStorage* cvOpenFileStorage( const char* filename,
                                           CvMemStorage* memstorage,
                                           int flags );
@@ -2689,7 +2691,7 @@ struct CvType
     static CvTypeInfo* first;
     static CvTypeInfo* last;
 };
-# 1747 "../../../cxcore/include/cxcore.h" 2
+# 1748 "../../../cxcore/include/cxcore.h" 2
 # 59 "../../../cv/include/cv.h" 2
 # 1 "../../../cv/include/cvtypes.h" 1
 # 51 "../../../cv/include/cvtypes.h"
@@ -3026,8 +3028,8 @@ extern "C" void cvWarpAffine( const CvArr* src, CvArr* dst, const CvMat* map_mat
 
 
 extern "C" CvMat* cvGetAffineTransform( const CvPoint2D32f * src,
-                              const CvPoint2D32f * dst,
-            CvMat * map_matrix );
+                                    const CvPoint2D32f * dst,
+                                    CvMat * map_matrix );
 
 
 extern "C" CvMat* cv2DRotationMatrix( CvPoint2D32f center, double angle,

diff --git a/opencv/interfaces/swig/general/Makefile.am b/opencv/interfaces/swig/general/Makefile.am
index b5bebe7072a7e41baf43b400c157c3f241151bc3..a1b2b38042780afcaeb9cd9b139030c4c8af3074 100644 (file)
--- a/opencv/interfaces/swig/general/Makefile.am
+++ b/opencv/interfaces/swig/general/Makefile.am
@@ -3,14 +3,27 @@
 
 BUILT_SOURCES = cvmacros.i
 
+EXTRA_DIST = \
+  cv.i \
+  cvarr_operators.i \
+  cvmacros.i \
+  doublepointers.i \
+  extensions.i \
+  highgui.i \
+  memory.i \
+  sizeof.i \
+  typemaps.i
+
 # the following rules keep wrappers up to date, if SWIG is present
 if UPDATE_SWIG_WRAPPERS
 
 CV_HEADER_FILES = \
-                  $(top_srcdir)/cxcore/include/cxtypes.h  $(top_srcdir)/cxcore/include/cxcore.h  \
-                 $(top_srcdir)/cv/include/cvtypes.h $(top_srcdir)/cv/include/cv.h          
+  $(top_srcdir)/cxcore/include/cxtypes.h \
+  $(top_srcdir)/cxcore/include/cxcore.h  \
+  $(top_srcdir)/cv/include/cvtypes.h \
+  $(top_srcdir)/cv/include/cv.h          
 
-cvmacros.i: $(CV_HEADER_FILES) Makefile
+cvmacros.i: $(CV_HEADER_FILES) Makefile.in
        $(PYTHON) $(top_srcdir)/utils/extract_macros.py $(CV_HEADER_FILES) > $@
 
 endif

diff --git a/opencv/interfaces/swig/general/Makefile.in b/opencv/interfaces/swig/general/Makefile.in
index 3e0d33fdd040676cc34a41637208f4379577a82c..f7c1baa2fe523327ac1b811041033fcda4f4d15c 100644 (file)
--- a/opencv/interfaces/swig/general/Makefile.in
+++ b/opencv/interfaces/swig/general/Makefile.in
@@ -217,11 +217,24 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 BUILT_SOURCES = cvmacros.i
+EXTRA_DIST = \
+  cv.i \
+  cvarr_operators.i \
+  cvmacros.i \
+  doublepointers.i \
+  extensions.i \
+  highgui.i \
+  memory.i \
+  sizeof.i \
+  typemaps.i
+
 
 # the following rules keep wrappers up to date, if SWIG is present
 @UPDATE_SWIG_WRAPPERS_TRUE@CV_HEADER_FILES = \
-@UPDATE_SWIG_WRAPPERS_TRUE@               $(top_srcdir)/cxcore/include/cxtypes.h  $(top_srcdir)/cxcore/include/cxcore.h  \
-@UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/cv/include/cvtypes.h $(top_srcdir)/cv/include/cv.h          
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxcore.h  \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cv/include/cvtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cv/include/cv.h          
 
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -388,7 +401,7 @@ uninstall-am: uninstall-info-am
        uninstall-info-am
 
 
-@UPDATE_SWIG_WRAPPERS_TRUE@cvmacros.i: $(CV_HEADER_FILES) Makefile
+@UPDATE_SWIG_WRAPPERS_TRUE@cvmacros.i: $(CV_HEADER_FILES) Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(PYTHON) $(top_srcdir)/utils/extract_macros.py $(CV_HEADER_FILES) > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/opencv/interfaces/swig/python/Makefile.am b/opencv/interfaces/swig/python/Makefile.am
index 43d8f2930edbe2e37613a56fb12224b87c6af8ed..9dbd0fde269407e401fb547aae9d3e310facaee2 100644 (file)
--- a/opencv/interfaces/swig/python/Makefile.am
+++ b/opencv/interfaces/swig/python/Makefile.am
@@ -15,23 +15,34 @@ AM_CPPFLAGS = \
 
 noinst_PYTHON = setup-for-win.py
 
-distcleancheck_listfiles = \
-  find -type f -exec sh -c 'test -f $(scrdir)/{} || echo {}'
-
-# Conditional targets #######################################################
-
-if BUILD_PYTHON_WRAPPERS
-
-  pkgpython_LTLIBRARIES = _cv.la _highgui.la
-
-  pkgpython_PYTHON      = \
-    __init__.py    \
-    cv.py          \
-    adaptors.py    \
-    highgui.py            \
-    matlab_syntax.py
-
-endif
+EXTRA_DIST = \
+  __init__.py \
+  cv.py \
+  adaptors.py \
+  highgui.py \
+  matlab_syntax.py \
+  \
+  cv.i \
+  cvaliases.i \
+  cvarr.i \
+  cvseq.i \
+  cvshadow.i \
+  highgui.i \
+  imagedata.i \
+  nointpb.i \
+  pyhelpers.i \
+  pytypemaps.i \
+  \
+  cvshadow.h \
+  error.h \
+  pycvseq.hpp \
+  pyhelpers.h \
+  \
+  _cv.cpp \
+  _highgui.cpp \
+  cvshadow.cpp \
+  error.cpp \
+  pyhelpers.cpp
 
 
 # SWIG #######################################################################
@@ -53,7 +64,7 @@ _cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i                   \
          $(top_srcdir)/interfaces/swig/general/cvmacros.i       \
          ../filtered/cv.h            \
          ../filtered/constants.h     \
-         Makefile
+         Makefile.in
        $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -o $@ $<
 
 # this rule creates the Python wrapper sources for highgui
@@ -62,22 +73,33 @@ _highgui.cpp: highgui.i nointpb.i pytypemaps.i                  \
              $(top_srcdir)/interfaces/swig/general/typemaps.i      \
               $(top_srcdir)/interfaces/swig/general/memory.i    \
              $(top_srcdir)/otherlibs/highgui/highgui.h             \
-              Makefile
+              Makefile.in
        $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
 
 CV_HEADER_FILES = \
-                  $(top_srcdir)/cxcore/include/cxtypes.h  $(top_srcdir)/cxcore/include/cxcore.h  \
-                 $(top_srcdir)/cv/include/cvtypes.h $(top_srcdir)/cv/include/cv.h          
+  $(top_srcdir)/cxcore/include/cxtypes.h \
+  $(top_srcdir)/cxcore/include/cxcore.h  \
+  $(top_srcdir)/cv/include/cvtypes.h \
+  $(top_srcdir)/cv/include/cv.h
 
-cvaliases.i: $(CV_HEADER_FILES) Makefile
+cvaliases.i: $(CV_HEADER_FILES) Makefile.in
        $(PYTHON) $(top_srcdir)/utils/extract_aliases.py $(CV_HEADER_FILES) > $@
 
-clean: clean-am
-       rm -f _cv.cpp _highgui.cpp cv.py highgui.py
 endif
 
 
-# Python #####################################################################
+# Conditional targets #######################################################
+
+if BUILD_PYTHON_WRAPPERS
+
+pkgpython_LTLIBRARIES = _cv.la _highgui.la
+
+pkgpython_PYTHON = \
+  __init__.py    \
+  cv.py          \
+  adaptors.py    \
+  highgui.py      \
+  matlab_syntax.py
 
 _cv_la_SOURCES    = _cv.cpp error.cpp error.h pyhelpers.cpp pyhelpers.h \
                     pycvseq.hpp cvshadow.cpp cvshadow.h \
@@ -86,7 +108,6 @@ _cv_la_CXXFLAGS   = $(PYTHON_CSPEC)
 _cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la
 _cv_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
                     -L$(SWIG_PYTHON_LIBS)
-#_cv_la_DEPENDENCIES = ../filtered/cv.h ../filtered/constants.h
 
 _highgui_la_SOURCES    = _highgui.cpp pyhelpers.cpp pyhelpers.h \
                          highgui.i
@@ -94,4 +115,5 @@ _highgui_la_CXXFLAGS     = $(PYTHON_CSPEC)
 _highgui_la_LIBADD       = $(top_builddir)/otherlibs/highgui/libhighgui.la
 _highgui_la_LDFLAGS      = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
                            -L$(SWIG_PYTHON_LIBS)
-#_highgui_la_DEPENDENCIES = $(top_srcdir)/otherlibs/highgui/highgui.h
+
+endif

diff --git a/opencv/interfaces/swig/python/Makefile.in b/opencv/interfaces/swig/python/Makefile.in
index 662a30bd0bc7d7c5171ba6e16be22b597248e880..92276016b9a9af8507cf96b9d80d6ab7781d173c 100644 (file)
--- a/opencv/interfaces/swig/python/Makefile.in
+++ b/opencv/interfaces/swig/python/Makefile.in
@@ -67,15 +67,23 @@ am__installdirs = "$(DESTDIR)$(pkgpythondir)" \
        "$(DESTDIR)$(pkgpythondir)"
 pkgpythonLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkgpython_LTLIBRARIES)
-_cv_la_DEPENDENCIES = $(top_builddir)/cv/src/libcv.la
-am__cv_la_OBJECTS = _cv_la-_cv.lo _cv_la-error.lo _cv_la-pyhelpers.lo \
-       _cv_la-cvshadow.lo
+@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_DEPENDENCIES =  \
+@BUILD_PYTHON_WRAPPERS_TRUE@   $(top_builddir)/cv/src/libcv.la
+am___cv_la_SOURCES_DIST = _cv.cpp error.cpp error.h pyhelpers.cpp \
+       pyhelpers.h pycvseq.hpp cvshadow.cpp cvshadow.h cv.i \
+       imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
+@BUILD_PYTHON_WRAPPERS_TRUE@am__cv_la_OBJECTS = _cv_la-_cv.lo \
+@BUILD_PYTHON_WRAPPERS_TRUE@   _cv_la-error.lo \
+@BUILD_PYTHON_WRAPPERS_TRUE@   _cv_la-pyhelpers.lo \
+@BUILD_PYTHON_WRAPPERS_TRUE@   _cv_la-cvshadow.lo
 _cv_la_OBJECTS = $(am__cv_la_OBJECTS)
 @BUILD_PYTHON_WRAPPERS_TRUE@am__cv_la_rpath = -rpath $(pkgpythondir)
-_highgui_la_DEPENDENCIES =  \
-       $(top_builddir)/otherlibs/highgui/libhighgui.la
-am__highgui_la_OBJECTS = _highgui_la-_highgui.lo \
-       _highgui_la-pyhelpers.lo
+@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_DEPENDENCIES = $(top_builddir)/otherlibs/highgui/libhighgui.la
+am___highgui_la_SOURCES_DIST = _highgui.cpp pyhelpers.cpp pyhelpers.h \
+       highgui.i
+@BUILD_PYTHON_WRAPPERS_TRUE@am__highgui_la_OBJECTS =  \
+@BUILD_PYTHON_WRAPPERS_TRUE@   _highgui_la-_highgui.lo \
+@BUILD_PYTHON_WRAPPERS_TRUE@   _highgui_la-pyhelpers.lo
 _highgui_la_OBJECTS = $(am__highgui_la_OBJECTS)
 @BUILD_PYTHON_WRAPPERS_TRUE@am__highgui_la_rpath = -rpath \
 @BUILD_PYTHON_WRAPPERS_TRUE@   $(pkgpythondir)
@@ -99,7 +107,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(_cv_la_SOURCES) $(_highgui_la_SOURCES)
-DIST_SOURCES = $(_cv_la_SOURCES) $(_highgui_la_SOURCES)
+DIST_SOURCES = $(am___cv_la_SOURCES_DIST) \
+       $(am___highgui_la_SOURCES_DIST)
 am__pkgpython_PYTHON_DIST = __init__.py cv.py adaptors.py highgui.py \
        matlab_syntax.py
 pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
@@ -278,42 +287,67 @@ AM_CPPFLAGS = \
   -DCV_NO_BACKWARD_COMPATIBILITY
 
 noinst_PYTHON = setup-for-win.py
-distcleancheck_listfiles = \
-  find -type f -exec sh -c 'test -f $(scrdir)/{} || echo {}'
+EXTRA_DIST = \
+  __init__.py \
+  cv.py \
+  adaptors.py \
+  highgui.py \
+  matlab_syntax.py \
+  \
+  cv.i \
+  cvaliases.i \
+  cvarr.i \
+  cvseq.i \
+  cvshadow.i \
+  highgui.i \
+  imagedata.i \
+  nointpb.i \
+  pyhelpers.i \
+  pytypemaps.i \
+  \
+  cvshadow.h \
+  error.h \
+  pycvseq.hpp \
+  pyhelpers.h \
+  \
+  _cv.cpp \
+  _highgui.cpp \
+  cvshadow.cpp \
+  error.cpp \
+  pyhelpers.cpp
+
+@UPDATE_SWIG_WRAPPERS_TRUE@CV_HEADER_FILES = \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cxcore/include/cxcore.h  \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cv/include/cvtypes.h \
+@UPDATE_SWIG_WRAPPERS_TRUE@  $(top_srcdir)/cv/include/cv.h
 
 
 # Conditional targets #######################################################
 @BUILD_PYTHON_WRAPPERS_TRUE@pkgpython_LTLIBRARIES = _cv.la _highgui.la
 @BUILD_PYTHON_WRAPPERS_TRUE@pkgpython_PYTHON = \
-@BUILD_PYTHON_WRAPPERS_TRUE@    __init__.py    \
-@BUILD_PYTHON_WRAPPERS_TRUE@    cv.py          \
-@BUILD_PYTHON_WRAPPERS_TRUE@    adaptors.py    \
-@BUILD_PYTHON_WRAPPERS_TRUE@    highgui.py        \
-@BUILD_PYTHON_WRAPPERS_TRUE@    matlab_syntax.py
-
-@UPDATE_SWIG_WRAPPERS_TRUE@CV_HEADER_FILES = \
-@UPDATE_SWIG_WRAPPERS_TRUE@               $(top_srcdir)/cxcore/include/cxtypes.h  $(top_srcdir)/cxcore/include/cxcore.h  \
-@UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/cv/include/cvtypes.h $(top_srcdir)/cv/include/cv.h          
-
+@BUILD_PYTHON_WRAPPERS_TRUE@  __init__.py    \
+@BUILD_PYTHON_WRAPPERS_TRUE@  cv.py          \
+@BUILD_PYTHON_WRAPPERS_TRUE@  adaptors.py    \
+@BUILD_PYTHON_WRAPPERS_TRUE@  highgui.py          \
+@BUILD_PYTHON_WRAPPERS_TRUE@  matlab_syntax.py
 
-# Python #####################################################################
-_cv_la_SOURCES = _cv.cpp error.cpp error.h pyhelpers.cpp pyhelpers.h \
-                    pycvseq.hpp cvshadow.cpp cvshadow.h \
-                    cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
+@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_SOURCES = _cv.cpp error.cpp error.h pyhelpers.cpp pyhelpers.h \
+@BUILD_PYTHON_WRAPPERS_TRUE@                    pycvseq.hpp cvshadow.cpp cvshadow.h \
+@BUILD_PYTHON_WRAPPERS_TRUE@                    cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
 
-_cv_la_CXXFLAGS = $(PYTHON_CSPEC)
-_cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la
-_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-                    -L$(SWIG_PYTHON_LIBS)
+@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_CXXFLAGS = $(PYTHON_CSPEC)
+@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la
+@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+@BUILD_PYTHON_WRAPPERS_TRUE@                    -L$(SWIG_PYTHON_LIBS)
 
-#_cv_la_DEPENDENCIES = ../filtered/cv.h ../filtered/constants.h
-_highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \
-                         highgui.i
+@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \
+@BUILD_PYTHON_WRAPPERS_TRUE@                         highgui.i
 
-_highgui_la_CXXFLAGS = $(PYTHON_CSPEC)
-_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la
-_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-                           -L$(SWIG_PYTHON_LIBS)
+@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_CXXFLAGS = $(PYTHON_CSPEC)
+@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la
+@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+@BUILD_PYTHON_WRAPPERS_TRUE@                           -L$(SWIG_PYTHON_LIBS)
 
 all: all-am
 
@@ -600,7 +634,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@UPDATE_SWIG_WRAPPERS_FALSE@clean: clean-am
+clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-pkgpythonLTLIBRARIES \
        mostlyclean-am
@@ -685,7 +719,7 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonLTLIBRARIES \
 @UPDATE_SWIG_WRAPPERS_TRUE@         $(top_srcdir)/interfaces/swig/general/cvmacros.i       \
 @UPDATE_SWIG_WRAPPERS_TRUE@         ../filtered/cv.h            \
 @UPDATE_SWIG_WRAPPERS_TRUE@         ../filtered/constants.h     \
-@UPDATE_SWIG_WRAPPERS_TRUE@         Makefile
+@UPDATE_SWIG_WRAPPERS_TRUE@         Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -o $@ $<
 
 # this rule creates the Python wrapper sources for highgui
@@ -694,15 +728,11 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonLTLIBRARIES \
 @UPDATE_SWIG_WRAPPERS_TRUE@          $(top_srcdir)/interfaces/swig/general/typemaps.i      \
 @UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/interfaces/swig/general/memory.i    \
 @UPDATE_SWIG_WRAPPERS_TRUE@          $(top_srcdir)/otherlibs/highgui/highgui.h             \
-@UPDATE_SWIG_WRAPPERS_TRUE@              Makefile
+@UPDATE_SWIG_WRAPPERS_TRUE@              Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
 
-@UPDATE_SWIG_WRAPPERS_TRUE@cvaliases.i: $(CV_HEADER_FILES) Makefile
+@UPDATE_SWIG_WRAPPERS_TRUE@cvaliases.i: $(CV_HEADER_FILES) Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(PYTHON) $(top_srcdir)/utils/extract_aliases.py $(CV_HEADER_FILES) > $@
-
-@UPDATE_SWIG_WRAPPERS_TRUE@clean: clean-am
-@UPDATE_SWIG_WRAPPERS_TRUE@    rm -f _cv.cpp _highgui.cpp cv.py highgui.py
-#_highgui_la_DEPENDENCIES = $(top_srcdir)/otherlibs/highgui/highgui.h
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/opencv/utils/Makefile.am b/opencv/utils/Makefile.am
index 09c8a309d346a537d42b3db54d4b676f76c5c4a6..438eddaebf9f8e4fecc238171048bd6e531d0b4e 100644 (file)
--- a/opencv/utils/Makefile.am
+++ b/opencv/utils/Makefile.am
@@ -6,15 +6,16 @@ EXTRA_DIST = \
     cvinfo/cvinfo.vcproj
 
 noinst_PYTHON = \
+    check_doc.py               \
+    cvt_xml2xml.py             \
     dos2unix.py                \
+    extract_aliases.py         \
+    extract_constants.py       \
     extract_doublepointers.py  \
+    extract_macros.py          \
     gen_make.py                \
     make_index.py              \
     search_leaks.py            \
-    check_doc.py               \
-    cvt_xml2xml.py             \
-    extract_constants.py       \
-    extract_macros.py          \
     unix2dos.py
 
 dist_noinst_SCRIPTS = \

diff --git a/opencv/utils/Makefile.in b/opencv/utils/Makefile.in
index bd3c26a6c7999377dba0767a13161bcc1cdaf638..38fd998a1cfc330fb491cfab088436cbf7caa9a9 100644 (file)
--- a/opencv/utils/Makefile.in
+++ b/opencv/utils/Makefile.in
@@ -224,15 +224,16 @@ EXTRA_DIST = \
     cvinfo/cvinfo.vcproj
 
 noinst_PYTHON = \
+    check_doc.py               \
+    cvt_xml2xml.py             \
     dos2unix.py                \
+    extract_aliases.py         \
+    extract_constants.py       \
     extract_doublepointers.py  \
+    extract_macros.py          \
     gen_make.py                \
     make_index.py              \
     search_leaks.py            \
-    check_doc.py               \
-    cvt_xml2xml.py             \
-    extract_constants.py       \
-    extract_macros.py          \
     unix2dos.py
 
 dist_noinst_SCRIPTS = \