[aravis] build: don't distribute arvconfig.h.



commit c8be1a6cdc3bfaf28834b6d2c290efaa426d7979
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Sun Jul 29 11:59:11 2012 +0200

    build: don't distribute arvconfig.h.
    
    As is it should not be automatically included by using <arv.h>, as
    it defines values without namespace (like PACKAGE, VERSION, ...), which
    conflict with those defined in the user project.

 gst/gstaravis.c     |    1 +
 src/Makefile.am     |    2 +-
 src/arvenums.h      |    1 -
 src/arvfakecamera.c |    1 +
 viewer/arvviewer.c  |    2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gst/gstaravis.c b/gst/gstaravis.c
index 97d616b..132ffb7 100644
--- a/gst/gstaravis.c
+++ b/gst/gstaravis.c
@@ -33,6 +33,7 @@
  * </refsect2>
  */
 
+#include <arvconfig.h>
 #include <gstaravis.h>
 #include <time.h>
 #include <string.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 7872e34..bd83c5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,7 +154,7 @@ libaravis_ ARAVIS_API_VERSION@_la_SOURCES = $(ARAVIS_SRCS) $(ARAVIS_SRCS_NO_INTR
 
 libaravis_ ARAVIS_API_VERSION@_ladir = $(includedir)/aravis- ARAVIS_API_VERSION@
 libaravis_ ARAVIS_API_VERSION@_la_HEADERS = $(ARAVIS_HDRS) $(ARAVIS_HDRS_NO_INTRO)
-libaravis_ ARAVIS_API_VERSION@_la_HEADERS += arvenumtypes.h arvconfig.h
+libaravis_ ARAVIS_API_VERSION@_la_HEADERS += arvenumtypes.h
 
 arvenumtypes.h: arvenumtypes.h.template $(ARAVIS_HDRS) $(ARAVIS_HDRS_NO_INTRO) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template arvenumtypes.h.template $(libaravis_ ARAVIS_API_VERSION@_la_HEADERS)) > $@
diff --git a/src/arvenums.h b/src/arvenums.h
index bec96ca..687cd05 100644
--- a/src/arvenums.h
+++ b/src/arvenums.h
@@ -24,7 +24,6 @@
 #define ARV_ENUMS_H
 
 #include <glib-object.h>
-#include <arvconfig.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfakecamera.c b/src/arvfakecamera.c
index 0ed37bd..43f3237 100644
--- a/src/arvfakecamera.c
+++ b/src/arvfakecamera.c
@@ -30,6 +30,7 @@
  * arv-fake-gv-camera is a GV camera simulator based on this class.
  */
 
+#include <arvconfig.h>
 #include <arvfakecamera.h>
 #include <arvgc.h>
 #include <arvgcregisternode.h>
diff --git a/viewer/arvviewer.c b/viewer/arvviewer.c
index 0e12326..769817b 100644
--- a/viewer/arvviewer.c
+++ b/viewer/arvviewer.c
@@ -20,13 +20,13 @@
  * Author: Emmanuel Pacaud <emmanuel gnome org>
  */
 
+#include <arvconfig.h>
 #include <gtk/gtk.h>
 #include <gst/gst.h>
 #include <gst/app/gstappsrc.h>
 #include <gst/interfaces/xoverlay.h>
 #include <gdk/gdkx.h>
 #include <arv.h>
-#include <arvenumtypes.h>
 #include <stdlib.h>
 #include <math.h>
 #include <glib/gi18n-lib.h>



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