gir-repository r254 - trunk/gir

[johan svn gnome org]

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

Log:
Make distcheck pass again

Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Nov 26 12:31:32 2008
@@ -1,15 +1,17 @@
 CLEANFILES =
-EXTRA_DIST = $(XPATH_TESTS)
+EXTRA_DIST = 
 lib_LTLIBRARIES =
+BUILT_GIRSOURCES =
+CUSTOM_GIRSOURCES =
+XPATH_TESTS =
 COMMON_CUSTOM_LDFLAGS= -module -avoid-version -rdynamic
 
-CUSTOM_GIRSOURCES = 	\
-	cairo-1.0.gir 	\
+BASE_GIRSOURCES = 		\
+	cairo-1.0.gir 		\
 	fontconfig-2.0.gir	\
 	freetype2-2.0.gir
-BUILT_GIRSOURCES =
-
-XPATH_TESTS =
+CUSTOM_GIRSOURCES += $(BASE_GIRSOURCES)
+EXTRA_DIST += $(BASE_GIRSOURCES)
 
 DBUS_GIROURCES = DBus-1.0.gir
 if BUILD_DBUS
@@ -224,12 +226,16 @@
 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_Gdk_custom_la_SOURCES = 	\
+	$(srcdir)/Gdk-custom.c		\
+	$(srcdir)/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
+libgirepo_Gtk_custom_la_SOURCES =	\
+	$(srcdir)/Gtk-custom.c		\
+	$(srcdir)/Gtk-custom.h
 
 if BUILD_GTK
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
@@ -338,6 +344,7 @@
 	     --library=notify \
 	     $(NOCLOSURE) \
              --pkg gtk+-2.0 \
+             --pkg libnotify \
              --output $@ \
              $(NOTIFY_INCLUDEDIR)/libnotify/*.h
 BUILT_GIRSOURCES += Notify-0.4.gir
@@ -379,7 +386,9 @@
 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
+libgirepo_Clutter_custom_la_SOURCES = 	\
+	$(srcdir)/Clutter-custom.c	\
+	$(srcdir)/Clutter-custom.h
 
 if BUILD_CLUTTER
 lib_LTLIBRARIES += libgirepo-Clutter-custom.la
@@ -904,7 +913,7 @@
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
-vpath %.gir $(srcdir):$(builddir)
+vpath %.gir $(builddir):$(srcdir)
 
 %.xpath: %.gir