[cheese/wip/camera-service: 1/2] Use config.h instead of cheese-config.h

[David King <davidk src gnome org>]

commit 1ee20a87641713a9d772ba9cf364345b048fd90c
Author: David King <amigadave amigadave com>
Date:   Mon Aug 18 17:33:57 2014 +0100

    Use config.h instead of cheese-config.h
    
    Use a standard filename for the genereated configuration header.

 .gitignore                               |    1 +
 configure.ac                             |    2 +-
 libcheese/cheese-avatar-chooser.c        |    2 +-
 libcheese/cheese-avatar-widget.c         |    2 +-
 libcheese/cheese-camera-device-monitor.c |    2 +-
 libcheese/cheese-camera-device.c         |    2 +-
 libcheese/cheese-camera.c                |    2 +-
 libcheese/cheese-fileutil.c              |    2 +-
 libcheese/cheese-widget.c                |    2 +-
 libcheese/um-crop-area.c                 |    2 +-
 tests/cheese-test-camera.c               |    2 +-
 tests/cheese-test-chooser.c              |    2 +-
 tests/cheese-test-widget.c               |    2 +-
 tests/test-libcheese-gtk.c               |    2 +-
 tests/test-libcheese.c                   |    2 +-
 15 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93da871..6acefa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ Makefile.in*
 /cheese-lcov.info
 /data/cheese-gtk.pc
 /data/cheese.pc
+/data/org.gnome.Camera.service
 /data/org.gnome.Cheese.appdata.xml
 /data/org.gnome.Cheese.appdata.valid
 /data/org.gnome.Cheese.desktop
diff --git a/configure.ac b/configure.ac
index a565044..c2fbdce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([Cheese],
         [https://wiki.gnome.org/Apps/Cheese])
 
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_HEADERS([cheese-config.h])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/libcheese/cheese-avatar-chooser.c b/libcheese/cheese-avatar-chooser.c
index 298ade5..a41dc43 100644
--- a/libcheese/cheese-avatar-chooser.c
+++ b/libcheese/cheese-avatar-chooser.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <glib/gi18n-lib.h>
 #include <canberra-gtk.h>
diff --git a/libcheese/cheese-avatar-widget.c b/libcheese/cheese-avatar-widget.c
index d1ba2df..e61aa93 100644
--- a/libcheese/cheese-avatar-widget.c
+++ b/libcheese/cheese-avatar-widget.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <glib/gi18n-lib.h>
 #include <canberra-gtk.h>
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
index 4a660db..fcc13b4 100644
--- a/libcheese/cheese-camera-device-monitor.c
+++ b/libcheese/cheese-camera-device-monitor.c
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
-  #include <cheese-config.h>
+  #include <config.h>
 #endif
 
 #include <glib-object.h>
diff --git a/libcheese/cheese-camera-device.c b/libcheese/cheese-camera-device.c
index a3d00bf..42efe66 100644
--- a/libcheese/cheese-camera-device.c
+++ b/libcheese/cheese-camera-device.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-  #include <cheese-config.h>
+  #include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 8a2c34a..1d6b077 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -21,7 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
-  #include <cheese-config.h>
+  #include <config.h>
 #endif
 
 #include <string.h>
diff --git a/libcheese/cheese-fileutil.c b/libcheese/cheese-fileutil.c
index 27b7748..5ba830e 100644
--- a/libcheese/cheese-fileutil.c
+++ b/libcheese/cheese-fileutil.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-  #include <cheese-config.h>
+  #include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/libcheese/cheese-widget.c b/libcheese/cheese-widget.c
index 08336e8..a0d5f04 100644
--- a/libcheese/cheese-widget.c
+++ b/libcheese/cheese-widget.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <glib/gi18n-lib.h>
 #include <clutter-gst/clutter-gst.h>
diff --git a/libcheese/um-crop-area.c b/libcheese/um-crop-area.c
index aef3947..7a9c064 100644
--- a/libcheese/um-crop-area.c
+++ b/libcheese/um-crop-area.c
@@ -19,7 +19,7 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/tests/cheese-test-camera.c b/tests/cheese-test-camera.c
index 7faa73d..e777cba 100644
--- a/tests/cheese-test-camera.c
+++ b/tests/cheese-test-camera.c
@@ -1,5 +1,5 @@
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/tests/cheese-test-chooser.c b/tests/cheese-test-chooser.c
index cca299e..bbf993a 100644
--- a/tests/cheese-test-chooser.c
+++ b/tests/cheese-test-chooser.c
@@ -1,5 +1,5 @@
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/tests/cheese-test-widget.c b/tests/cheese-test-widget.c
index eed0bd1..80571a2 100644
--- a/tests/cheese-test-widget.c
+++ b/tests/cheese-test-widget.c
@@ -1,4 +1,4 @@
-#include "cheese-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <glib/gi18n.h>
diff --git a/tests/test-libcheese-gtk.c b/tests/test-libcheese-gtk.c
index 2248663..4779c04 100644
--- a/tests/test-libcheese-gtk.c
+++ b/tests/test-libcheese-gtk.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/tests/test-libcheese.c b/tests/test-libcheese.c
index 626be8e..a87e03e 100644
--- a/tests/test-libcheese.c
+++ b/tests/test-libcheese.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cheese-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <glib/gi18n.h>