From: Brian Matherly <pez4brian@yahoo.com>
Date: Fri, 28 Mar 2014 03:54:55 +0000 (-0500)
Subject: Avoid unnecessary compilation when running "./configure; make; make install" multiple... 
X-Git-Url: https://git.sesse.net/?p=mlt;a=commitdiff_plain;h=6f8293d53fc21742d9d43f94f0e590e1bfcb8ee0

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

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 4475c17e..35d2d97a 100644
--- 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 60f8dd78..c7098455 100755
--- 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 fa98b22e..7016602b 100644
--- 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 01203874..1ec705e3 100644
--- 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 71b3b1a9..2e917dc4 100644
--- 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 04c5176c..cc19bd5e 100644
--- 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 0ff9f0b8..5949890c 100755
--- 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 697c7e6c..d0915c9b 100644
--- 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 76d6b9b1..1496f2e2 100644
--- 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 fff59edb..bbaf6902 100644
--- 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 83152d4e..c4074648 100644
--- 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 d725e7ce..7a6c60c2 100644
--- 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 7f81a39b..20a10bdf 100755
--- 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 7e4b7395..8294e6eb 100644
--- 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