GNOME.org
 

gir-repository r229 - in trunk: . gir

Author: johan
Date: Tue Nov 25 00:02:37 2008
New Revision: 229
URL: http://svn.gnome.org/viewvc/gir-repository?rev=229&view=rev

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

	* gir/Makefile.am: Remove *_LIBDIR variables which are unused



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

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Nov 25 00:02:37 2008
@@ -37,8 +37,6 @@
 
 if BUILD_GCONF
 GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
-GCONF_LIBDIR=`pkg-config --variable=libdir gconf-2.0`
-
 GConf-2.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GConf --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -54,7 +52,6 @@
 
 if BUILD_SOUP
 SOUP_INCLUDEDIR=`pkg-config --variable=includedir libsoup-2.4`/libsoup-2.4
-SOUP_LIBDIR=`pkg-config --variable=libdir libsoup-2.4`
 Soup-2.0.gir: $(G_IR_SCANNER) Soup-custom.c
 	$(G_IR_SCANNER) -v --namespace Soup --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -71,7 +68,6 @@
 
 if BUILD_GNOMEKEYRING
 GNOMEKEYRING_INCLUDEDIR=`pkg-config --variable=includedir gnome-keyring-1`/gnome-keyring-1
-GNOMEKEYRING_LIBDIR=`pkg-config --variable=libdir gnome-keyring-1`
 GnomeKeyring-2.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GnomeKeyring --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -89,7 +85,6 @@
 
 if BUILD_PANGO
 PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
-PANGO_LIBDIR=`pkg-config --variable=libdir pango`
 Pango-1.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -106,7 +101,6 @@
             $(PANGO_INCLUDEDIR)/pango/pango-*.h
 BUILT_GIRSOURCES += Pango-1.0.gir
 
-PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
 PangoFT2-1.0.gir: fontconfig-2.0.gir freetype2-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -125,7 +119,6 @@
             $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
 BUILT_GIRSOURCES += PangoFT2-1.0.gir
 
-PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
 PangoCairo-1.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -143,7 +136,6 @@
 BUILT_GIRSOURCES += PangoCairo-1.0.gir
 
 if BUILD_PANGOXFT
-PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
 PangoXft-1.0.gir: fontconfig-2.0.gir xft-2.0.gir xlib-2.0.gir Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -162,7 +154,6 @@
             $(PANGO_INCLUDEDIR)/pango/pangoxft-render.h
 BUILT_GIRSOURCES += PangoXft-1.0.gir
 
-PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
 PangoX-1.0.gir: xlib-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoX --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -184,7 +175,6 @@
 #poppler
 if BUILD_POPPLER
 POPPLER_INCLUDEDIR=`pkg-config --variable=includedir poppler-glib`/poppler
-POPPLER_LIBDIR=`pkg-config --variable=libdir poppler-glib`
 Poppler-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Poppler --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -205,7 +195,6 @@
 # atk
 if BUILD_ATK
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
-ATK_LIBDIR=`pkg-config --variable=libdir atk`
 Atk-1.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Atk --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -222,7 +211,6 @@
 # gdk
 if BUILD_GTK
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
-GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
 GdkPixbuf-2.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GdkPixbuf --nsversion=2.0 --strip-prefix=Gdk\
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -252,7 +240,6 @@
 	Gdk-custom.h
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-$(GDK_TARGET)-2.0`/gtk-2.0
-GDK_LIBDIR=`pkg-config --variable=libdir gdk-$(GDK_TARGET)-2.0`
 Gdk-2.0.gir: $(srcdir)/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 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -293,7 +280,6 @@
 	Gtk-custom.h
 
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-$(GDK_TARGET)-2.0`/gtk-2.0
-GTK_LIBDIR=`pkg-config --variable=libdir gtk+-$(GDK_TARGET)-2.0`
 Gtk-2.0.gir: $(srcdir)/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 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -328,7 +314,6 @@
 # webkit
 if BUILD_WEBKIT
 WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
-WEBKIT_LIBDIR=`pkg-config --variable=libdir webkit-1.0`
 WebKit-1.0.gir: JSCore-1.0.gir Gtk-2.0.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -351,7 +336,6 @@
 # libnotify
 if BUILD_NOTIFY
 NOTIFY_INCLUDEDIR=`pkg-config --variable=includedir libnotify`
-NOTIFY_LIBDIR=`pkg-config --variable=libdir libnotify`
 Notify-0.4.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Notify --nsversion=0.4 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -368,7 +352,6 @@
 # gtksourceview
 if BUILD_GTKSOURCEVIEW
 GTKSOURCEVIEW_INCLUDEDIR=`pkg-config --variable=includedir gtksourceview-2.0`/gtksourceview-2.0
-GTKSOURCEVIEW_LIBDIR=`pkg-config --variable=libdir gtksourceview-2.0`
 GtkSource-2.2.gir: $(G_IR_SCANNER) Gtk-2.0.gir
 	$(G_IR_SCANNER) -v --namespace GtkSource --strip-prefix=Gtk --nsversion=2.2 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -385,7 +368,6 @@
 # vte
 if BUILD_VTE
 VTE_INCLUDEDIR=`pkg-config --variable=includedir vte`
-VTE_LIBDIR=`pkg-config --variable=libdir vte`
 Vte-1.0.gir: $(G_IR_SCANNER) Gtk-2.0.gir
 	$(G_IR_SCANNER) -v --namespace Vte --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -416,7 +398,6 @@
 	Clutter-custom.h
 
 CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-$(CLUTTER_BACKEND)-0.8`
-CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-$(CLUTTER_BACKEND)-0.8`
 ClutterJson-0.8.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -458,7 +439,6 @@
 
 if BUILD_CLUTTERGTK
 CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.8`
-CLUTTERGTK_LIBDIR=`pkg-config --variable=libdir clutter-gtk-0.8`
 # This one is called GtkClutter because it matches the C naming
 GtkClutter-0.8.gir: Clutter-0.8.gir Gtk-2.0.gir GtkClutter-custom.c $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GtkClutter --nsversion=0.8 \
@@ -483,7 +463,6 @@
 
 if BUILD_CLUTTERCAIRO
 CLUTTERCAIRO_INCLUDEDIR=`pkg-config --variable=includedir clutter-cairo-0.8`
-CLUTTERCAIRO_LIBDIR=`pkg-config --variable=libdir clutter-cairo-0.8`
 ClutterCairo-0.8.gir: Clutter-0.8.gir $(srcdir)/cairo-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterCairo --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -502,7 +481,6 @@
 
 if BUILD_GOOCANVAS
 GOOCANVAS_INCLUDEDIR=`pkg-config --variable=includedir goocanvas`
-GOOCANVAS_LIBDIR=`pkg-config --variable=libdir goocanvas`
 GooCanvas-0.10.gir: Gtk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GooCanvas --nsversion=0.10 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -520,7 +498,6 @@
 # GStreamer
 if BUILD_GSTREAMER
 GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
-GST_LIBDIR=`pkg-config --variable=libdir gstreamer-0.10`
 Gst-0.10.gir: libxml2-2.0.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace Gst --nsversion=0.10 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -613,7 +590,6 @@
 
 if BUILD_MISSIONCONTROL
 MISSIONCONTROL_INCLUDEDIR=`pkg-config --variable=includedir libmissioncontrol`
-MISSIONCONTROL_LIBDIR=`pkg-config --variable=libdir libmissioncontrol`
 MissionControl.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace MissionControl \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -631,7 +607,6 @@
 
 if BUILD_GSSDP
 GSSDP_INCLUDEDIR=`pkg-config --variable=includedir gssdp-1.0`/gssdp-1.0
-GSSDP_LIBDIR=`pkg-config --variable=libdir gssdp-1.0`
 GSSDP-1.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GSSDP --nsversion=1.0 \
 	     --add-include-path=$(srcdir) --add-include-path=. \
@@ -647,7 +622,6 @@
 
 if BUILD_GUPNP
 GUPNP_INCLUDEDIR=`pkg-config --variable=includedir gupnp-1.0`/gupnp-1.0
-GUPNP_LIBDIR=`pkg-config --variable=libdir gupnp-1.0`
 Gupnp-1.0.gir: libxml2-2.0.gir GSSDP-1.0.gir Soup-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gupnp --nsversion=1.0 \
 	     --add-include-path=$(srcdir) --add-include-path=. \
@@ -667,7 +641,6 @@
 
 if BUILD_AVAHI
 AVAHI_INCLUDEDIR=`pkg-config --variable=includedir avahi-gobject`/avahi-gobject
-AVAHI_LIBDIR=`pkg-config --variable=libdir avahi-gobject`
 Avahi-0.6.gir: AvahiCore-0.6.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Avahi --nsversion=0.6 \
 	     --strip-prefix=Ga \
@@ -686,7 +659,6 @@
 
 if BUILD_BABL
 BABL_INCLUDEDIR=`pkg-config --variable=includedir babl`/babl-0.0
-BABL_LIBDIR=`pkg-config --variable=libdir babl`
 Babl-0.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Babl --nsversion=0.0 \
             --add-include-path=$(srcdir) --add-include-path=. \
@@ -702,7 +674,6 @@
 
 if BUILD_UNIQUE
 UNIQUE_INCLUDEDIR=`pkg-config --variable=includedir unique-1.0`/unique-1.0/unique
-UNIQUE_LIBDIR=`pkg-config --variable=libdir unique-1.0`
 Unique-1.0.gir: Gtk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Unique --nsversion=1.0 \
 	     --add-include-path=$(srcdir) --add-include-path=. \
@@ -718,7 +689,6 @@
 
 if BUILD_NAUTILUS
 NAUTILUS_INCLUDEDIR=`pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
-NAUTILUS_LIBDIR=`pkg-config --variable=libdir libnautilus-extension`
 Nautilus-1.0.gir: Gtk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Nautilus --nsversion=1.0 \
             --add-include-path=$(srcdir) --add-include-path=\
@@ -734,7 +704,6 @@
 
 if BUILD_GMENU
 GMENU_INCLUDEDIR=`pkg-config --variable=includedir libgnome-menu`/gnome-menus
-GMENU_LIBDIR=`pkg-config --variable=libdir libgnome-menu`
 GMenu-2.0.gir: Gtk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GMenu --nsversion=2.0 \
             --add-include-path=$(srcdir) --add-include-path=. \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]