Avoid unnecessary compilation when running "./configure; make; make install" multiple...

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 4475c17e2806571bbb62bbe5ef0821972628e5a0..35d2d97a404d18e25350afd35e6e10c4838b030c 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -1,4 +1,4 @@
-CFLAGS += -I../..
+CFLAGS := -I../.. $(CFLAGS)
 
 LDFLAGS += -L../../framework -lmlt -lpthread -lm
 

diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure
index 60f8dd7845eb332ba609e3822d64628e0c676426..c70984551a1e5b2ff93648abaf76ed0d9e9d7329 100755 (executable)
--- a/src/modules/gtk2/configure
+++ b/src/modules/gtk2/configure
@@ -35,42 +35,54 @@ else
                exit 0
        fi
 
-       [ "$disable_gtk2" != "0" ] && echo "- gtk2 not found: gtk2 preview disabled"
-       [ "$disable_pixbuf" != "0" ] && echo "- pixbuf not found: pixbuf loader and rescaler disabled"
-       [ "$disable_pango" != "0" ] && echo "- pango not found: pango titler disabled"
-
-       echo > config.h
-       [ "$disable_gtk2" = "0" ] && echo "#define USE_GTK2" >> config.h
-       [ "$disable_pixbuf" = "0" ] && echo "#define USE_PIXBUF" >> config.h
-       [ "$disable_pango" = "0" ] && echo "#define USE_PANGO" >> config.h
-
        echo > config.mak
-       [ "$disable_gtk2" = "0" ] && echo "USE_GTK2=1" >> config.mak
-       [ "$disable_pixbuf" = "0" ] && echo "USE_PIXBUF=1" >> config.mak
-       [ "$disable_pango" = "0" ] && echo "USE_PANGO=1" >> config.mak
+       
+       if [ "$disable_gtk2" = "0" ]
+       then
+               echo "CFLAGS += -DUSE_GTK2" >> config.mak
+               echo "USE_GTK2=1" >> config.mak
+       else
+               echo "- gtk2 not found: gtk2 preview disabled"
+       fi
+       
+       if [ "$disable_pixbuf" = "0" ]
+       then
+               echo "CFLAGS += -DUSE_PIXBUF" >> config.mak
+               echo "USE_PIXBUF=1" >> config.mak
+       else
+               echo "- pixbuf not found: pixbuf loader and rescaler disabled"
+       fi
+
+       if [ "$disable_pango" = "0" ]
+       then
+               echo "CFLAGS += -DUSE_PANGO" >> config.mak
+                       echo "USE_PANGO=1" >> config.mak
+       else
+               echo "- pango not found: pango titler disabled"
+       fi
 
        [ "$pkgconfig_prefix" != "" ] && echo "PKGCONFIG_PREFIX=$pkgconfig_prefix" >> config.mak
 
        pkg-config --exists 'libexif'
        if [ $? -eq 0 ]
        then
-           echo "Libexif found, enabling auto rotate"
-           echo "#define USE_EXIF" >> config.h
-           echo "USE_EXIF=1" >> config.mak
-           echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak
-           echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak
+               echo "- Libexif found, enabling auto rotate"
+               echo "USE_EXIF=1" >> config.mak
+               echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak
+               echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak
+               echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak
        elif [ -d "$exif_libdir" -a -d "$exif_includedir" ]
        then
                # test if we have a libexif
                if [ -f "$exif_libdir/exif-data.h" ]
                then
-                       echo "Libexif found, enabling auto rotate"
-                       echo "#define USE_EXIF" >> config.h
+                       echo "- Libexif found, enabling auto rotate"
                        echo "USE_EXIF=1" >> config.mak
                        echo EXIFCXXFLAGS=-I$exif_includedir >> config.mak
-                        echo EXIFLIBS=-L$exif_libdir lexif >> config.mak
+                       echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak
+                       echo EXIFLIBS=-L$exif_libdir lexif >> config.mak
                else
-                       echo "Libexif not found, disabling exif features (auto rotate)"
+                       echo "- Libexif not found, disabling exif features (auto rotate)"
                fi
        fi
 

diff --git a/src/modules/gtk2/factory.c b/src/modules/gtk2/factory.c
index fa98b22e14eb2e7fece0674db9f40758da82b20e..7016602b5deb9e81305e281b9ad8f77b88b419ea 100644 (file)
--- a/src/modules/gtk2/factory.c
+++ b/src/modules/gtk2/factory.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include <string.h>
 #include <framework/mlt.h>
 #include <gdk/gdk.h>

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 01203874af3788cbe5bbcabe08d5dddb4347543e..1ec705e3e6fd4e8e24d3524079accccfadda1760 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -25,8 +25,6 @@
 #include <framework/mlt_tokeniser.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "config.h"
-
 #ifdef USE_EXIF
 #include <libexif/exif-data.h>
 #endif

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 71b3b1a9be941de391c65a1601158277568c0e96..2e917dc4f045392d9ed5a8b6dba22c636fcdf37c 100644 (file)
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -1,5 +1,5 @@
-CFLAGS += -I../../
-CXXFLAGS += $(CFLAGS) -Wno-deprecated
+CFLAGS := -I../../ $(CFLAGS)
+CXXFLAGS := $(CFLAGS) -Wno-deprecated $(CXXFLAGS)
 
 LDFLAGS += -L../../framework -lmlt -lpthread
 

diff --git a/src/modules/kino/avi.cc b/src/modules/kino/avi.cc
index 04c5176c8458dfd881847af9ba412e7a3adc3901..cc19bd5e1a000ca73deca8bf487fa3dfbd351bd9 100644 (file)
--- a/src/modules/kino/avi.cc
+++ b/src/modules/kino/avi.cc
@@ -17,8 +17,6 @@
 * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "config.h"
-
 // C++ includes
 
 #include <cstring>

diff --git a/src/modules/kino/configure b/src/modules/kino/configure
index 0ff9f0b875ac9bdd00a14702033d3bc8a39353cf..5949890c18b7fef94a46d3e474cebd3126ad086f 100755 (executable)
--- a/src/modules/kino/configure
+++ b/src/modules/kino/configure
@@ -17,14 +17,22 @@ then
        pkg-config libdv 2> /dev/null
        libdv_disabled=$?
 
-       echo > config.h
-       [ "$lqt_disabled" = "0" ] && echo "#define HAVE_LIBQUICKTIME" >> config.h
-       [ "$libdv_disabled" = "0" ] && echo "#define HAVE_LIBDV" >> config.h
        echo > config.mak
-       [ "$lqt_disabled" = "0" ] && echo "HAVE_LIBQUICKTIME=1" >> config.mak
-       [ "$libdv_disabled" = "0" ] && echo "HAVE_LIBDV=1" >> config.mak
+       
+       if [ "$lqt_disabled" = "0" ]
+       then
+               echo "CFLAGS += -DHAVE_LIBQUICKTIME" >> config.mak
+               echo "HAVE_LIBQUICKTIME=1" >> config.mak
+       else
+               echo "- libquicktime not found: only enabling dv avi support"
+       fi
+       
+       if [ "$libdv_disabled" = "0" ]
+       then
+               echo "CFLAGS += -DHAVE_LIBDV" >> config.mak
+               echo "HAVE_LIBDV=1" >> config.mak
+       fi
 
-       [ "$lqt_disabled" != "0" ] && echo "- libquicktime not found: only enabling dv avi support"
        [ "$libdv_disabled" != "0" -a "$lqt_disabled" = "0" ] && echo "- libdv not found: mov dv may not have audio"
        
        exit 0

diff --git a/src/modules/kino/filehandler.cc b/src/modules/kino/filehandler.cc
index 697c7e6c15a780b41f7e0882b45eb5cdd57bccf7..d0915c9bb9bdbe6fe926b59dbbf4044aaa5ee1d0 100644 (file)
--- a/src/modules/kino/filehandler.cc
+++ b/src/modules/kino/filehandler.cc
@@ -17,8 +17,6 @@
 * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "config.h"
-
 extern "C" {
 #include <framework/mlt_frame.h>
 }

diff --git a/src/modules/kino/kino_wrapper.cc b/src/modules/kino/kino_wrapper.cc
index 76d6b9b106edd89c109d8bfec04e562fe51abdde..1496f2e2bdb1acfb18546fe9ae4e88fe14019360 100644 (file)
--- a/src/modules/kino/kino_wrapper.cc
+++ b/src/modules/kino/kino_wrapper.cc
@@ -18,8 +18,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-
 #include <cstring>
 #include <cstdlib>
 

diff --git a/src/modules/kino/riff.cc b/src/modules/kino/riff.cc
index fff59edb6c26299b92a41ff6dd754afa84a29002..bbaf6902becbd4bb68dffe395734a8c6ffc96721 100644 (file)
--- a/src/modules/kino/riff.cc
+++ b/src/modules/kino/riff.cc
@@ -17,8 +17,6 @@
 * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "config.h"
-
 // C++ includes
 
 #include <string> 

diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile
index 83152d4e8e5da9f0faa1c7d0d92f7d58061557a2..c407464851a66d2f3124dc20f43738eb4546ff17 100644 (file)
--- a/src/modules/opengl/Makefile
+++ b/src/modules/opengl/Makefile
@@ -1,4 +1,4 @@
-CFLAGS += -I../..
+CFLAGS := -I../.. $(CFLAGS)
 
 LDFLAGS += -L../../framework -lmlt -lm
 
@@ -29,7 +29,7 @@ CPPOBJS += transition_movit_luma.o
 CPPOBJS += transition_movit_mix.o
 CPPOBJS += transition_movit_overlay.o
 
-CXXFLAGS += -Wno-deprecated $(CFLAGS)
+CXXFLAGS := -Wno-deprecated $(CFLAGS) $(CXXFLAGS)
 CXXFLAGS += $(shell pkg-config --cflags movit 2> /dev/null)
 
 SHADERDIR = $(shell pkg-config --variable=shaderdir movit)

diff --git a/src/modules/qt/Makefile b/src/modules/qt/Makefile
index d725e7cee850ee3cafca8bea876b0e255b9cae65..7a6c60c2bf771c3f528f553565d2b565e81ea8a9 100644 (file)
--- a/src/modules/qt/Makefile
+++ b/src/modules/qt/Makefile
@@ -1,4 +1,4 @@
-CFLAGS += -I../..
+CFLAGS := -I../.. $(CFLAGS)
 
 LDFLAGS += -L../../framework -lmlt -lpthread -lm -L../../mlt++ -lmlt++
 

diff --git a/src/modules/qt/configure b/src/modules/qt/configure
index 7f81a39b96c0b27153992ba90c24678c9cc96424..20a10bdf1ef7a9f46a975bcbec84b2701d2e1bac 100755 (executable)
--- a/src/modules/qt/configure
+++ b/src/modules/qt/configure
@@ -55,16 +55,15 @@ else
                esac
        done
 
-       echo > config.h
        echo > config.mak
 
        pkg-config --exists 'libexif'
        if [ $? -eq 0 ]
        then
                echo "- Libexif found, enabling auto rotate"
-               echo "#define USE_EXIF" >> config.h
                echo "USE_EXIF=1" >> config.mak
                echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak
+               echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak
                echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak
        elif [ -d "$exif_libdir" -a -d "$exif_includedir" ]
        then
@@ -72,9 +71,9 @@ else
                if [ -f "$exif_libdir/exif-data.h" ]
                then
                        echo "- Libexif found, enabling auto rotate"
-                       echo "#define USE_EXIF" >> config.h
                        echo "USE_EXIF=1" >> config.mak
                        echo EXIFCXXFLAGS=-I$exif_includedir >> config.mak
+                       echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak
                        echo EXIFLIBS=-L$exif_libdir lexif >> config.mak
                else
                        echo "- Libexif not found, disabling exif features (auto rotate)"

diff --git a/src/modules/qt/qimage_wrapper.h b/src/modules/qt/qimage_wrapper.h
index 7e4b7395421d44b33f1e964a8f6b8d44910b7f3a..8294e6eb00efe48bf05e0f51eb90746a95c0319d 100644 (file)
--- a/src/modules/qt/qimage_wrapper.h
+++ b/src/modules/qt/qimage_wrapper.h
@@ -26,7 +26,6 @@
 
 #include <framework/mlt.h>
 
-#include "config.h"
 #include <pthread.h>
 
 #ifdef __cplusplus