[cheese] use CHEESE_GTK instead of CHEESEGTK as a autotools variable



commit 82934c4b2999c421fc0df55a4b183de3d99bb783
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Mon Jan 31 23:01:38 2011 +0100

    use CHEESE_GTK instead of CHEESEGTK as a autotools variable

 configure.ac          |    6 +++---
 libcheese/Makefile.am |    6 +++---
 src/Makefile.am       |    4 ++--
 tests/Makefile.am     |   10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5c4f1cc..1b4b64d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,7 +146,7 @@ AC_SUBST(CHEESE_CFLAGS)
 AC_SUBST(CHEESE_LIBS)
 CHEESE_LIBS="$CHEESE_LIBS -lgstinterfaces-0.10"
 
-PKG_CHECK_MODULES(CHEESEGTK, \ 
+PKG_CHECK_MODULES(CHEESE_GTK, \ 
   gio-2.0 >= $GIO_REQUIRED \
   gtk+-2.0 >= $GTK_REQUIRED \
   gdk-2.0 >= $GDK_REQUIRED \
@@ -159,10 +159,10 @@ PKG_CHECK_MODULES(CHEESEGTK, \
   $UDEV_PKG \
   gnome-video-effects
   )
-AC_SUBST(CHEESEGTK_CFLAGS)
+AC_SUBST(CHEESE_GTK_CFLAGS)
 
 
-AC_SUBST(CHEESEGTK_LIBS)
+AC_SUBST(CHEESE_GTK_LIBS)
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am
index e4e49ce..43e03c0 100644
--- a/libcheese/Makefile.am
+++ b/libcheese/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\" \
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
 	$(CHEESE_CFLAGS) \
-	$(CHEESEGTK_CFLAGS)
+	$(CHEESE_GTK_CFLAGS)
 
 lib_LTLIBRARIES = libcheese.la libcheese-gtk.la
 
@@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.am.enums
 
 libcheese_gtk_la_CFLAGS = \
 	$(CHEESE_CFLAGS) \
-	$(CHEESEGTK_CFLAGS)
+	$(CHEESE_GTK_CFLAGS)
 
 libcheese_la_CFLAGS = \
 	$(CHEESE_CFLAGS)
@@ -68,7 +68,7 @@ libcheese_la_LIBADD = \
 libcheese_gtk_la_LIBADD = \
 	libcheese.la \
 	$(CHEESE_LIBS) \
-	$(CHEESEGTK_LIBS)
+	$(CHEESE_GTK_LIBS)
 libcheese_gtk_la_LDFLAGS = \
 	-version-info $(CHEESE_LT_VERSION)		\
 	-export-symbols $(srcdir)/cheese-gtk.symbols	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 599f23f..8d58b75 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
 	$(CHEESE_CFLAGS) \
-	$(CHEESEGTK_CFLAGS) \
+	$(CHEESE_GTK_CFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-I top_srcdir@/libcheese 
 
@@ -55,4 +55,4 @@ cheese_LDADD = \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(CHEESE_LIBS) \
-	$(CHEESEGTK_LIBS)
+	$(CHEESE_GTK_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e53b5eb..b94f29b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
 	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\" \
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
 	$(CHEESE_CFLAGS) \
-	$(CHEESEGTK_CFLAGS) \
+	$(CHEESE_GTK_CFLAGS) \
 	-I top_srcdir@/libcheese \
 	$(NULL)
 
@@ -27,23 +27,23 @@ cheese_test_monitor_SOURCES = cheese-test-monitor.c
 test_webcam_button_SOURCES = test-webcam-button.c
 
 cheese_test_widget_LDADD = $(CHEESE_LIBS) \
-	$(CHEESEGTK_LIBS) \
+	$(CHEESE_GTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(NULL)
 cheese_test_camera_LDADD = $(CHEESE_LIBS) \
-	$(CHEESEGTK_LIBS) \
+	$(CHEESE_GTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(NULL)
 cheese_test_monitor_LDADD = $(CHEESE_LIBS) \
-	$(CHEESEGTK_LIBS) \
+	$(CHEESE_GTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(NULL)
 test_webcam_button_LDADD = $(XTEST_LIBS)
 cheese_test_chooser_SOURCES = cheese-test-chooser.c
 cheese_test_chooser_LDADD = $(CHEESE_LIBS) \
-	$(CHEESEGTK_LIBS) \
+	$(CHEESE_GTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(NULL)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]