GNOME.org
 

[libwnck] build: Use single include when building against libwnck

commit 1f927d94617ef75c5c9a93a86a55a27e472df8dd
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Jan 20 01:16:24 2011 +0100

    build: Use single include when building against libwnck
    
    Users of libwnck should just include <libwnck/libwnck.h> now.

 doc/Makefile.am              |    2 +-
 libwnck/Makefile.am          |    6 +++++-
 libwnck/application.h        |    6 ++++--
 libwnck/class-group.h        |    6 +++++-
 libwnck/libwnck.h            |    6 ++++--
 libwnck/pager.h              |    4 ++++
 libwnck/screen.h             |    4 ++++
 libwnck/selector.h           |    5 +++++
 libwnck/tasklist.h           |    4 ++++
 libwnck/util.h               |    4 ++++
 libwnck/window-action-menu.h |    4 ++++
 libwnck/window.h             |    4 ++++
 libwnck/wnckprop.c           |    1 -
 libwnck/workspace.h          |    4 ++++
 14 files changed, 52 insertions(+), 8 deletions(-)
---
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ec7bde4..54cf3d0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -42,7 +42,7 @@ extra_files =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(LIBWNCK_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(LIBWNCK_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE -DWNCK_COMPILATION
 GTKDOC_LIBS = $(top_builddir)/libwnck/libwnck-3.la $(LIBWNCK_LIBS)
 
 include $(top_srcdir)/gtk-doc.make
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
index 2499693..d2250a3 100644
--- a/libwnck/Makefile.am
+++ b/libwnck/Makefile.am
@@ -79,6 +79,7 @@ libwnck_3_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
 	$(XLIB_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"Wnck\"		\
+	-DWNCK_COMPILATION		\
 	-DSN_API_NOT_YET_FROZEN=1
 
 libwnck_3_la_LIBADD =	\
@@ -116,6 +117,9 @@ wnck-marshal.c: wnck-marshal.list wnck-marshal.h
 
 wnck-enum-types.h: $(wnck_headers)
 	$(AM_V_GEN)glib-mkenums \
+		--fhead "#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)\n" \
+		--fhead "#error \"Only <libwnck/libwnck.h> can be included directly.\"\n" \
+		--fhead "#endif\n\n" \
 		--fhead "#ifndef __WNCK_ENUM_TYPES_H__\n" \
 		--fhead "#define __WNCK_ENUM_TYPES_H__\n\n" \
 		--fhead "G_BEGIN_DECLS\n\n" \
@@ -169,7 +173,7 @@ introspection_sources = $(wnck_sources) $(libwnckinclude_HEADERS)
 
 Wnck-3.0.gir: libwnck-3.la
 Wnck_3_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0 Gtk-3.0
-Wnck_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Wnck_3_0_gir_CFLAGS = $(libwnck_3_la_CPPFLAGS)
 Wnck_3_0_gir_LIBS = libwnck-3.la
 Wnck_3_0_gir_SCANNERFLAGS = --pkg-export=libwnck-3.0
 Wnck_3_0_gir_FILES = $(introspection_sources)
diff --git a/libwnck/application.h b/libwnck/application.h
index 287c1d4..bcf6cee 100644
--- a/libwnck/application.h
+++ b/libwnck/application.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_APPLICATION_H
 #define WNCK_APPLICATION_H
 
@@ -95,5 +99,3 @@ const char* wnck_application_get_startup_id (WnckApplication *app);
 G_END_DECLS
 
 #endif /* WNCK_APPLICATION_H */
-
-
diff --git a/libwnck/class-group.h b/libwnck/class-group.h
index 42f148b..337ecab 100644
--- a/libwnck/class-group.h
+++ b/libwnck/class-group.h
@@ -22,6 +22,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_CLASS_GROUP_H
 #define WNCK_CLASS_GROUP_H
 
@@ -82,4 +86,4 @@ GdkPixbuf *wnck_class_group_get_mini_icon (WnckClassGroup *class_group);
 
 G_END_DECLS
 
-#endif
+#endif /* WNCK_CLASS_GROUP_H */
diff --git a/libwnck/libwnck.h b/libwnck/libwnck.h
index 1213cee..3a7921a 100644
--- a/libwnck/libwnck.h
+++ b/libwnck/libwnck.h
@@ -23,6 +23,8 @@
 #ifndef WNCK_LIB_H
 #define WNCK_LIB_H
 
+#define __LIBWNCK_H_INSIDE__
+
 #include <libwnck/window.h>
 #include <libwnck/application.h>
 #include <libwnck/class-group.h>
@@ -38,6 +40,6 @@
 
 #include <libwnck/wnck-enum-types.h>
 
-#endif /* WNCK_LIB_H */
-
+#undef __LIBWNCK_H_INSIDE__
 
+#endif /* WNCK_LIB_H */
diff --git a/libwnck/pager.h b/libwnck/pager.h
index 1234cff..b25890b 100644
--- a/libwnck/pager.h
+++ b/libwnck/pager.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_PAGER_H
 #define WNCK_PAGER_H
 
diff --git a/libwnck/screen.h b/libwnck/screen.h
index 4c0c8ff..9844035 100644
--- a/libwnck/screen.h
+++ b/libwnck/screen.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_SCREEN_H
 #define WNCK_SCREEN_H
 
diff --git a/libwnck/selector.h b/libwnck/selector.h
index ceb737d..e51f8a2 100644
--- a/libwnck/selector.h
+++ b/libwnck/selector.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_SELECTOR_H
 #define WNCK_SELECTOR_H
 
@@ -64,4 +68,5 @@ GtkWidget *wnck_selector_new      (void);
 GType      wnck_selector_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
+
 #endif /* WNCK_SELECTOR_H */
diff --git a/libwnck/tasklist.h b/libwnck/tasklist.h
index 0b9f9ca..2961840 100644
--- a/libwnck/tasklist.h
+++ b/libwnck/tasklist.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_TASKLIST_H
 #define WNCK_TASKLIST_H
 
diff --git a/libwnck/util.h b/libwnck/util.h
index e438386..68517e3 100644
--- a/libwnck/util.h
+++ b/libwnck/util.h
@@ -22,6 +22,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_UTIL_H
 #define WNCK_UTIL_H
 
diff --git a/libwnck/window-action-menu.h b/libwnck/window-action-menu.h
index a378055..bad63b9 100644
--- a/libwnck/window-action-menu.h
+++ b/libwnck/window-action-menu.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_WINDOW_ACTION_MENU_H
 #define WNCK_WINDOW_ACTION_MENU_H
 
diff --git a/libwnck/window.h b/libwnck/window.h
index 130f0e0..673f44a 100644
--- a/libwnck/window.h
+++ b/libwnck/window.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_WINDOW_H
 #define WNCK_WINDOW_H
 
diff --git a/libwnck/wnckprop.c b/libwnck/wnckprop.c
index e51b9dd..81810fd 100644
--- a/libwnck/wnckprop.c
+++ b/libwnck/wnckprop.c
@@ -45,7 +45,6 @@
 #include <glib/gi18n.h>
 
 #include <libwnck/libwnck.h>
-#include <libwnck/class-group.h>
 
 enum {
   INVALID_MODE,
diff --git a/libwnck/workspace.h b/libwnck/workspace.h
index 3f0b626..dda64f7 100644
--- a/libwnck/workspace.h
+++ b/libwnck/workspace.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
+#error "Only <libwnck/libwnck.h> can be included directly."
+#endif
+
 #ifndef WNCK_WORKSPACE_H
 #define WNCK_WORKSPACE_H
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]