GNOME.org
 

gir-repository r252 - in trunk: . gir

Author: johan
Date: Wed Nov 26 12:11:42 2008
New Revision: 252
URL: http://svn.gnome.org/viewvc/gir-repository?rev=252&view=rev

Log:
2008-11-26  Johan Dahlin  <jdahlin async com br>

        Bug 562311 â gir-repository: missing clutter files

        * gir/Makefile.am:
        Include everything we know about in EXTRA_DIST, even
        if we don't have all dependencies installed.



Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Nov 26 12:11:42 2008
@@ -11,35 +11,49 @@
 
 XPATH_TESTS =
 
+DBUS_GIROURCES = DBus-1.0.gir
 if BUILD_DBUS
-CUSTOM_GIRSOURCES += DBus-1.0.gir
+CUSTOM_GIRSOURCES += $(DBUS_GIROURCES)
 endif
+EXTRA_DIST += $(DBUS_GIROURCES)
 
+AVAHI_GIRSOURCES = AvahiCore-0.6.gir
 if BUILD_AVAHI
-CUSTOM_GIRSOURCES += AvahiCore-0.6.gir
+CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
 endif
+EXTRA_DIST += $(AVAHI_GIRSOURCES)
 
+LIBXML_GIRSOURCES = libxml2-2.0.gir
 if BUILD_LIBXML
-CUSTOM_GIRSOURCES += libxml2-2.0.gir
+CUSTOM_GIRSOURCES += $(LIBXML_GIRSOURCES)
 endif
+EXTRA_DIST += $(LIBXML_GIRSOURCES)
 
+GL_GIRSOURCES = GL-1.0.gir
 if BUILD_GL
-CUSTOM_GIRSOURCES += GL-1.0.gir
+CUSTOM_GIRSOURCES += $(GL_GIRSOURCES)
 endif
+EXTRA_DIST += $(GL_GIRSOURCES)
 
+MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \
+			    TelepathyGLib.gir \
+			    LibTelepathy.gir
 if BUILD_MISSIONCONTROL
-CUSTOM_GIRSOURCES += DBusGLib-1.0.gir \
-	TelepathyGLib.gir \
-	LibTelepathy.gir
+CUSTOM_GIRSOURCES += $(MISSIONCONTROL_GIRSOURCES)
 endif
+EXTRA_DIST += $(MISSIONCONTROL_GIRSOURCES)
 
+XFT_GIRSOURCES = xft-2.0.gir xlib-2.0.gir
 if BUILD_XFT
-CUSTOM_GIRSOURCES += xft-2.0.gir xlib-2.0.gir
+CUSTOM_GIRSOURCES += $(XFT_GIRSOURCES)
 endif
+EXTRA_DIST += $(XFT_GIRSOURCES)
 
+XFIXES_GIRSOURCES = xfixes-4.0.gir xfixes-4.0.gir
 if BUILD_XFIXES
-CUSTOM_GIRSOURCES += xfixes-4.0.gir xfixes-4.0.gir
+CUSTOM_GIRSOURCES += $(XFIXES_GIRSOURCES)
 endif
+EXTRA_DIST += $(XFIXES_GIRSOURCES)
 
 if BUILD_GCONF
 GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
@@ -69,9 +83,9 @@
             -I$(SOUP_INCLUDEDIR) \
             $(srcdir)/Soup-custom.c \
             $(SOUP_INCLUDEDIR)/libsoup/*.h
-EXTRA_DIST += Soup-custom.c
 BUILT_GIRSOURCES += Soup-2.0.gir
 endif
+EXTRA_DIST += Soup-custom.c
 
 if BUILD_GNOMEKEYRING
 GNOMEKEYRING_INCLUDEDIR=`pkg-config --variable=includedir gnome-keyring-1`/gnome-keyring-1
@@ -215,7 +229,18 @@
 BUILT_GIRSOURCES += Atk-1.0.gir
 endif
 
-# gdk
+# Gtk
+
+libgirepo_Gdk_custom_la_CPPFLAGS = $(GDK_CFLAGS)
+libgirepo_Gdk_custom_la_LIBADD = $(GDK_LIBS)
+libgirepo_Gdk_custom_la_LDFLAGS = $(COMMON_CUSTOM_LDFLAGS)
+libgirepo_Gdk_custom_la_SOURCES = Gdk-custom.c Gdk-custom.h
+
+libgirepo_Gtk_custom_la_CPPFLAGS = $(GTK_CFLAGS)
+libgirepo_Gtk_custom_la_LIBADD = $(GTK_LIBS)
+libgirepo_Gtk_custom_la_LDFLAGS = $(COMMON_CUSTOM_LDFLAGS)
+libgirepo_Gtk_custom_la_SOURCES = Gtk-custom.c Gtk-custom.h
+
 if BUILD_GTK
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
 GdkPixbuf-2.0.gir: $(G_IR_SCANNER)
@@ -233,19 +258,6 @@
 XPATH_TESTS += GdkPixbuf-2.0.xpath
 
 lib_LTLIBRARIES += libgirepo-Gdk-custom.la
-
-libgirepo_Gdk_custom_la_CPPFLAGS = \
-	$(GDK_CFLAGS)
-
-libgirepo_Gdk_custom_la_LIBADD = \
-	$(GDK_LIBS)
-
-libgirepo_Gdk_custom_la_LDFLAGS=$(COMMON_CUSTOM_LDFLAGS)
-
-libgirepo_Gdk_custom_la_SOURCES = \
-	Gdk-custom.c \
-	Gdk-custom.h
-
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-$(GDK_TARGET)-2.0`/gtk-2.0
 Gdk-2.0.gir: cairo-1.0.gir Pango-1.0.gir $(GDK_TARGET_GIRS:%=%.gir) GdkPixbuf-2.0.gir libgirepo-Gdk-custom.la $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gdk --nsversion=2.0 \
@@ -266,26 +278,11 @@
              --pkg pango \
              --pkg gdk-$(GDK_TARGET)-2.0 \
              -I$(GDK_INCLUDEDIR) \
-	     $(srcdir)/Gdk-custom.h \
-	     $(srcdir)/Gdk-custom.c \
+	     $(libgirepo_Gdk_custom_la_SOURCES) \
              $(GDK_INCLUDEDIR)/gdk/*.h
 BUILT_GIRSOURCES += Gdk-2.0.gir
 
-# gtk
 lib_LTLIBRARIES += libgirepo-Gtk-custom.la
-
-libgirepo_Gtk_custom_la_CPPFLAGS = \
-	$(GTK_CFLAGS)
-
-libgirepo_Gtk_custom_la_LIBADD = \
-	$(GTK_LIBS)
-
-libgirepo_Gtk_custom_la_LDFLAGS=$(COMMON_CUSTOM_LDFLAGS)
-
-libgirepo_Gtk_custom_la_SOURCES = \
-	Gtk-custom.c \
-	Gtk-custom.h
-
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-$(GDK_TARGET)-2.0`/gtk-2.0
 Gtk-2.0.gir: cairo-1.0.gir Pango-1.0.gir Atk-1.0.gir $(GDK_TARGET_GIRS:%=%.gir) GdkPixbuf-2.0.gir Gdk-2.0.gir libgirepo-Gtk-custom.la $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gtk --nsversion=2.0 \
@@ -311,17 +308,20 @@
              -D__GTK_TEXT_LAYOUT_H__ \
              -D__GTK_TEXT_DISPLAY_H__ \
 	     -I$(GTK_INCLUDEDIR) \
-	     $(srcdir)/Gtk-custom.h \
-	     $(srcdir)/Gtk-custom.c \
+	     $(libgirepo_Gtk_custom_la_SOURCES) \
              $(GTK_INCLUDEDIR)/gtk/*.h
 BUILT_GIRSOURCES += Gtk-2.0.gir
 XPATH_TESTS += Gtk-2.0.xpath
 endif
+EXTRA_DIST += Gtk-2.0.xpath GdkPixbuf-2.0.xpath
+EXTRA_DIST += $(libgirepo_Gdk_custom_la_SOURCES)
+EXTRA_DIST += $(libgirepo_Gtk_custom_la_SOURCES)
 
 # webkit
+JSCORE_GIRSOURCES = JSCore-1.0.gir
 if BUILD_WEBKIT
 WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
-WebKit-1.0.gir: JSCore-1.0.gir Gtk-2.0.gir $(G_IR_SCANNER)
+WebKit-1.0.gir: $(JSCORE_GIRSOURCES) Gtk-2.0.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GObject-2.0 \
@@ -336,9 +336,11 @@
 	     -I$(WEBKIT_INCLUDEDIR) \
              $(WEBKIT_INCLUDEDIR)/webkit-1.0/webkit/*.h
 BUILT_GIRSOURCES += WebKit-1.0.gir
-CUSTOM_GIRSOURCES += JSCore-1.0.gir
+CUSTOM_GIRSOURCES += $(JSCORE_GIRSOURCES)
 XPATH_TESTS += WebKit-1.0.xpath
 endif BUILD_WEBKIT
+EXTRA_DIST += $(JSCORE_GIRSOURCES)
+EXTRA_DIST += WebKit-1.0.xpath
 
 # libnotify
 if BUILD_NOTIFY
@@ -389,21 +391,14 @@
 endif
 
 # clutter
+libgirepo_Clutter_custom_la_CPPFLAGS = $(CLUTTER_CFLAGS)
+libgirepo_Clutter_custom_la_LIBADD = $(CLUTTER_LIBS)
+libgirepo_Clutter_custom_la_LDFLAGS = $(COMMON_CUSTOM_LDFLAGS)
+libgirepo_Clutter_custom_la_SOURCES = Clutter-custom.c Clutter-custom.h
+
 if BUILD_CLUTTER
 lib_LTLIBRARIES += libgirepo-Clutter-custom.la
 
-libgirepo_Clutter_custom_la_CPPFLAGS = \
-	$(CLUTTER_CFLAGS)
-
-libgirepo_Clutter_custom_la_LIBADD = \
-	$(CLUTTER_LIBS)
-
-libgirepo_Clutter_custom_la_LDFLAGS=$(COMMON_CUSTOM_LDFLAGS)
-
-libgirepo_Clutter_custom_la_SOURCES = \
-	Clutter-custom.c \
-	Clutter-custom.h
-
 CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-$(CLUTTER_BACKEND)-0.8`
 ClutterJson-0.8.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
@@ -439,10 +434,11 @@
 	     $(srcdir)/Clutter-custom.h \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/cogl/*.h \
 	     $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/*.h
-EXTRA_DIST += clutter-0.8.c
 BUILT_GIRSOURCES += Clutter-0.8.gir ClutterJson-0.8.gir
 XPATH_TESTS += Clutter-0.8.xpath
 endif BUILD_CLUTTER
+EXTRA_DIST += clutter-0.8.c
+EXTRA_DIST += Clutter-0.8.xpath
 
 if BUILD_CLUTTERGTK
 CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.8`
@@ -465,8 +461,8 @@
 	     $(srcdir)/GtkClutter-custom.c \
              $(CLUTTERGTK_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h
 BUILT_GIRSOURCES += GtkClutter-0.8.gir
-EXTRA_DIST += GtkClutter-custom.c
 endif BUILD_CLUTTERGTK
+EXTRA_DIST += GtkClutter-custom.c
 
 if BUILD_CLUTTERCAIRO
 CLUTTERCAIRO_INCLUDEDIR=`pkg-config --variable=includedir clutter-cairo-0.8`
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]