GNOME.org
 

gir-repository r253 - trunk/gir

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

Log:
Remove unnecessary -I, get it via --pkg instead

Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Nov 26 12:16:27 2008
@@ -65,7 +65,6 @@
 	    $(NOCLOSURE) \
             --output $@ \
             --pkg gconf-2.0 \
-            -I$(GCONF_INCLUDEDIR) \
             $(GCONF_INCLUDEDIR)/gconf/*.h
 BUILT_GIRSOURCES += GConf-2.0.gir
 endif
@@ -80,7 +79,6 @@
 	    $(NOCLOSURE) \
             --output $@ \
             --pkg libsoup-2.4 \
-            -I$(SOUP_INCLUDEDIR) \
             $(srcdir)/Soup-custom.c \
             $(SOUP_INCLUDEDIR)/libsoup/*.h
 BUILT_GIRSOURCES += Soup-2.0.gir
@@ -97,7 +95,6 @@
 	    $(NOCLOSURE) \
             --output $@ \
             --pkg gnome-keyring-1 \
-            -I$(GNOMEKEYRING_INCLUDEDIR) \
             $(GNOMEKEYRING_INCLUDEDIR)/*.h
 BUILT_GIRSOURCES += GnomeKeyring-2.0.gir
 endif
@@ -118,7 +115,6 @@
             --pkg cairo \
             --pkg pango \
             --pkg freetype2 \
-            -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pango-*.h
 BUILT_GIRSOURCES += Pango-1.0.gir
 
@@ -135,7 +131,6 @@
             --pkg gobject-2.0 \
             --pkg freetype2 \
             --pkg pangoft2 \
-            -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangoft2.h \
             $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
 BUILT_GIRSOURCES += PangoFT2-1.0.gir
@@ -152,7 +147,6 @@
             --pkg gobject-2.0 \
             --pkg cairo \
             --pkg pangocairo \
-            -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangocairo.h
 BUILT_GIRSOURCES += PangoCairo-1.0.gir
 
@@ -170,7 +164,6 @@
             --pkg gobject-2.0 \
             --pkg freetype2 \
             --pkg pangoxft \
-            -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangoxft.h \
             $(PANGO_INCLUDEDIR)/pango/pangoxft-render.h
 BUILT_GIRSOURCES += PangoXft-1.0.gir
@@ -187,7 +180,6 @@
             --pkg gobject-2.0 \
             --pkg freetype2 \
             --pkg pangox \
-            -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangox.h
 BUILT_GIRSOURCES += PangoX-1.0.gir
 endif
@@ -208,7 +200,6 @@
              --output $@ \
              --pkg gdk-2.0 \
              --pkg gobject-2.0 \
-             -I$(POPPLER_INCLUDEDIR) \
              $(POPPLER_INCLUDEDIR)/glib/*.h
 BUILT_GIRSOURCES += Poppler-0.8.gir
 endif
@@ -224,7 +215,6 @@
 	     $(NOCLOSURE) \
              --output $@ \
              --pkg gobject-2.0 \
-             -I$(ATK_INCLUDEDIR) \
              $(ATK_INCLUDEDIR)/atk/*.h
 BUILT_GIRSOURCES += Atk-1.0.gir
 endif
@@ -252,7 +242,6 @@
              --output $@ \
              --pkg gobject-2.0 \
              --pkg gio-2.0 \
-             -I$(GDKPIXBUF_INCLUDEDIR) \
              $(GDKPIXBUF_INCLUDEDIR)/gdk-pixbuf/*.h
 BUILT_GIRSOURCES += GdkPixbuf-2.0.gir
 XPATH_TESTS += GdkPixbuf-2.0.xpath
@@ -277,7 +266,6 @@
              --pkg atk \
              --pkg pango \
              --pkg gdk-$(GDK_TARGET)-2.0 \
-             -I$(GDK_INCLUDEDIR) \
 	     $(libgirepo_Gdk_custom_la_SOURCES) \
              $(GDK_INCLUDEDIR)/gdk/*.h
 BUILT_GIRSOURCES += Gdk-2.0.gir
@@ -307,7 +295,6 @@
              -D__GTK_FILE_SYSTEM_H__ \
              -D__GTK_TEXT_LAYOUT_H__ \
              -D__GTK_TEXT_DISPLAY_H__ \
-	     -I$(GTK_INCLUDEDIR) \
 	     $(libgirepo_Gtk_custom_la_SOURCES) \
              $(GTK_INCLUDEDIR)/gtk/*.h
 BUILT_GIRSOURCES += Gtk-2.0.gir
@@ -333,7 +320,6 @@
              --pkg gtk+-2.0 \
              --pkg webkit-1.0 \
              --output $@ \
-	     -I$(WEBKIT_INCLUDEDIR) \
              $(WEBKIT_INCLUDEDIR)/webkit-1.0/webkit/*.h
 BUILT_GIRSOURCES += WebKit-1.0.gir
 CUSTOM_GIRSOURCES += $(JSCORE_GIRSOURCES)
@@ -353,7 +339,6 @@
 	     $(NOCLOSURE) \
              --pkg gtk+-2.0 \
              --output $@ \
-	     -I$(NOTIFY_INCLUDEDIR) \
              $(NOTIFY_INCLUDEDIR)/libnotify/*.h
 BUILT_GIRSOURCES += Notify-0.4.gir
 endif
@@ -367,9 +352,9 @@
              --include=Gtk-2.0 \
 	     --library=gtksourceview-2.0 \
 	     $(NOCLOSURE) \
+             --pkg gtksourceview-2.0 \
              --pkg gtk+-2.0 \
              --output $@ \
-	     -I$(GTKSOURCEVIEW_INCLUDEDIR) \
              $(GTKSOURCEVIEW_INCLUDEDIR)/gtksourceview/*.h
 BUILT_GIRSOURCES += GtkSource-2.2.gir
 endif
@@ -384,8 +369,8 @@
 	     --library=vte \
 	     $(NOCLOSURE) \
              --pkg gtk+-2.0 \
+             --pkg vte \
              --output $@ \
-	     -I$(VTE_INCLUDEDIR) \
              $(VTE_INCLUDEDIR)/vte/*.h
 BUILT_GIRSOURCES += Vte-1.0.gir
 endif
@@ -409,7 +394,6 @@
              --pkg gobject-2.0 \
              --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
              --output $@ \
-	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
 
 Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterJson-0.8.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(CLUTTER_BACKEND_GIRS:%=%.gir) $(G_IR_SCANNER) clutter-0.8.c
@@ -428,7 +412,6 @@
              --pkg gobject-2.0 \
              --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
              --output $@ \
-	     -I$(CLUTTER_INCLUDEDIR) \
 	     $(srcdir)/clutter-0.8.c \
 	     $(srcdir)/Clutter-custom.c \
 	     $(srcdir)/Clutter-custom.h \
@@ -454,10 +437,9 @@
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
              --pkg gtk+-2.0 \
+             --pkg clutter-0.8 \
              --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
              --output $@ \
-	     -I$(CLUTTER_INCLUDEDIR) \
-	     -I$(CLUTTERGTK_INCLUDEDIR) \
 	     $(srcdir)/GtkClutter-custom.c \
              $(CLUTTERGTK_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h
 BUILT_GIRSOURCES += GtkClutter-0.8.gir
@@ -477,7 +459,6 @@
              --pkg cairo \
              --pkg clutter-cairo-0.8 \
              --output $@ \
-	     -I$(CLUTTERCAIRO_INCLUDEDIR) \
              $(CLUTTERCAIRO_INCLUDEDIR)/clutter-0.8/clutter-cairo/*.h
 BUILT_GIRSOURCES += ClutterCairo-0.8.gir
 endif BUILD_CLUTTERCAIRO
@@ -493,7 +474,6 @@
 	     $(NOCLOSURE) \
              --pkg goocanvas \
              --output $@ \
-	     -I$(GOOCANVAS_INCLUDEDIR) \
              $(GOOCANVAS_INCLUDEDIR)/goocanvas-1.0/*.h
 BUILT_GIRSOURCES += GooCanvas-0.10.gir
 endif BUILD_GOOCANVAS
@@ -513,7 +493,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-base-0.10 \
              --output $@ \
-	     -I$(GST_INCLUDEDIR) \
 	     $(GST_INCLUDEDIR)/gst/gstbin.h \
 	     $(GST_INCLUDEDIR)/gst/gstbuffer.h \
 	     $(GST_INCLUDEDIR)/gst/gstbus.h \
@@ -580,7 +559,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-base-0.10 \
              --output $@ \
-	     -I$(GSTBASE_INCLUDEDIR) \
 	     $(GSTBASE_INCLUDEDIR)/gst/base/*.h
 BUILT_GIRSOURCES += GstBase-0.10.gir
 
@@ -595,7 +573,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-controller-0.10 \
              --output $@ \
-	     -I$(GSTCONTROLLER_INCLUDEDIR) \
 	     $(GSTCONTROLLER_INCLUDEDIR)/gst/controller/*h
 BUILT_GIRSOURCES += GstController-0.10.gir
 
@@ -610,7 +587,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-dataprotocol-0.10 \
              --output $@ \
-	     -I$(GSTDATAPROTOCOL_INCLUDEDIR) \
 	     $(GSTDATAPROTOCOL_INCLUDEDIR)/gst/dataprotocol/*h
 # Bug in GstDPVersion enum name parsing
 #BUILT_GIRSOURCES += GstDataprotocol-0.10.gir
@@ -626,7 +602,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-net-0.10 \
              --output $@ \
-	     -I$(GSTNET_INCLUDEDIR) \
 	     $(GSTNET_INCLUDEDIR)/gst/net/*h
 BUILT_GIRSOURCES += GstNet-0.10.gir
 
@@ -646,7 +621,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-audio-0.10 \
              --output $@ \
-	     -I$(GSTAUDIO_INCLUDEDIR) \
 	     $(GSTAUDIO_INCLUDEDIR)/gst/audio/*h
 BUILT_GIRSOURCES += GstAudio-0.10.gir
 
@@ -661,7 +635,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-fft-0.10 \
              --output $@ \
-	     -I$(GSTFFT_INCLUDEDIR) \
 	     $(GSTFFT_INCLUDEDIR)/gst/fft/*h
 BUILT_GIRSOURCES += GstFft-0.10.gir
 
@@ -676,7 +649,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-interfaces-0.10 \
              --output $@ \
-	     -I$(GSTINTERFACES_INCLUDEDIR) \
 	     $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/*h
 BUILT_GIRSOURCES += GstInterfaces-0.10.gir
 
@@ -691,7 +663,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-netbuffer-0.10 \
              --output $@ \
-	     -I$(GSTNETBUFFER_INCLUDEDIR) \
 	     $(GSTNETBUFFER_INCLUDEDIR)/gst/netbuffer/*h
 BUILT_GIRSOURCES += GstNetbuffer-0.10.gir
 
@@ -706,7 +677,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-pbutils-0.10 \
              --output $@ \
-	     -I$(GSTPBUTILS_INCLUDEDIR) \
 	     $(GSTPBUTILS_INCLUDEDIR)/gst/pbutils/*h
 BUILT_GIRSOURCES += GstPbutils-0.10.gir
 
@@ -721,7 +691,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-riff-0.10 \
              --output $@ \
-	     -I$(GSTRIFF_INCLUDEDIR) \
 	     $(GSTRIFF_INCLUDEDIR)/gst/riff/*h
 BUILT_GIRSOURCES += GstRiff-0.10.gir
 
@@ -737,7 +706,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-rtp-0.10 \
              --output $@ \
-	     -I$(GSTRTP_INCLUDEDIR) \
 	     $(GSTRTP_INCLUDEDIR)/gst/rtp/*h
 BUILT_GIRSOURCES += GstRtp-0.10.gir
 
@@ -753,7 +721,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-rtsp-0.10 \
              --output $@ \
-	     -I$(GSTRTSP_INCLUDEDIR) \
 	     $(GSTRTSP_INCLUDEDIR)/gst/rtsp/*h
 BUILT_GIRSOURCES += GstRtsp-0.10.gir
 
@@ -768,7 +735,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-sdp-0.10 \
              --output $@ \
-	     -I$(GSTSDP_INCLUDEDIR) \
 	     $(GSTSDP_INCLUDEDIR)/gst/sdp/*h
 BUILT_GIRSOURCES += GstSdp-0.10.gir
 
@@ -783,7 +749,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-tag-0.10 \
              --output $@ \
-	     -I$(GSTTAG_INCLUDEDIR) \
 	     $(GSTTAG_INCLUDEDIR)/gst/tag/*h
 BUILT_GIRSOURCES += GstTag-0.10.gir
 
@@ -799,7 +764,6 @@
              --pkg gstreamer-0.10 \
              --pkg gstreamer-video-0.10 \
              --output $@ \
-	     -I$(GSTVIDEO_INCLUDEDIR) \
 	     $(GSTVIDEO_INCLUDEDIR)/gst/video/*h
 BUILT_GIRSOURCES += GstVideo-0.10.gir
 
@@ -816,7 +780,6 @@
 	     $(NOCLOSURE) \
              --pkg libmissioncontrol \
              --output $@ \
-	     -I$(MISSIONCONTROL_INCLUDEDIR) \
              $(MISSIONCONTROL_INCLUDEDIR)/libmissioncontrol/_gen/*.h \
              $(MISSIONCONTROL_INCLUDEDIR)/libmissioncontrol/*.h
 BUILT_GIRSOURCES += MissionControl.gir
@@ -832,7 +795,6 @@
 	     $(NOCLOSURE) \
              --output $@ \
              --pkg gssdp-1.0 \
-	     -I$(GSSDP_INCLUDEDIR) \
              $(GSSDP_INCLUDEDIR)/libgssdp/*.h
 BUILT_GIRSOURCES += GSSDP-1.0.gir
 endif BUILD_GSSDP
@@ -851,7 +813,6 @@
              --output $@ \
              --pkg libsoup-2.4 \
              --pkg gupnp-1.0 \
-	     -I$(GUPNP_INCLUDEDIR) \
              $(GUPNP_INCLUDEDIR)/libgupnp/*.h
 BUILT_GIRSOURCES += Gupnp-1.0.gir
 endif BUILD_GUPNP
@@ -868,7 +829,6 @@
 	     $(NOCLOSURE) \
              --output $@ \
              --pkg avahi-gobject \
-	     -I$(AVAHI_INCLUDEDIR) \
              $(AVAHI_INCLUDEDIR)/*.h
 BUILT_GIRSOURCES += Avahi-0.6.gir
 CUSTOM_GIRSOURCES += AvahiCore-0.6.gir
@@ -884,7 +844,6 @@
             $(NOCLOSURE) \
             --output $@ \
             --pkg babl \
-            -I$(BABL_INCLUDEDIR) \
             $(BABL_INCLUDEDIR)/babl/*.h
 BUILT_GIRSOURCES += Babl-0.0.gir
 endif BUILD_BABL
@@ -899,7 +858,6 @@
 	     $(NOCLOSURE) \
              --output $@ \
              --pkg unique-1.0 \
-	     -I$(UNIQUE_INCLUDEDIR) \
              $(UNIQUE_INCLUDEDIR)/*.h
 BUILT_GIRSOURCES += Unique-1.0.gir
 endif BUILD_UNIQUE
@@ -914,7 +872,6 @@
             --output $@ \
             --pkg libnautilus-extension \
             --pkg gtk+-2.0 \
-            -I$(NAUTILUS_INCLUDEDIR) \
             $(NAUTILUS_INCLUDEDIR)/*.h
 BUILT_GIRSOURCES += Nautilus-1.0.gir
 endif
@@ -929,7 +886,6 @@
             --output $@ \
             --pkg libgnome-menu \
              -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
-            -I$(GMENU_INCLUDEDIR) \
             $(GMENU_INCLUDEDIR)/*.h
 BUILT_GIRSOURCES += GMenu-2.0.gir
 endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]