ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/libindicate/gir-buildd-fix into lp:libindicate.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Make file fixes to make the GIR generation not depend on pkgconfig
working with these libraries.  Instead we're using the CFLAGS that we
have locally, which have already been evaluated.
-- 
https://code.launchpad.net/~ted/libindicate/gir-buildd-fix/+merge/20982
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== modified file 'libindicate-gtk/Makefile.am'
--- libindicate-gtk/Makefile.am	2010-02-03 18:25:37 +0000
+++ libindicate-gtk/Makefile.am	2010-03-09 17:20:33 +0000
@@ -28,7 +28,7 @@
 	-export-symbols-regex "^[^_d].*"
 
 libindicate_gtk_la_CFLAGS = \
-	-I $(srcdir)/.. \
+	-I $(top_srcdir) \
 	-Wall -Werror \
 	$(LIBINDICATEGTK_CFLAGS)
 
@@ -57,7 +57,8 @@
 		--include=GdkPixbuf-2.0 \
 		--include=Indicate-0.2 \
 		--add-include-path=$(top_builddir)/libindicate \
-		--library=indicate --pkg indicate \
+		--library=indicate \
+		$(LIBINDICATEGTK_CFLAGS) -I$(srcdir) -I$(top_srcdir) \
 		--output Indicate-Gtk-0.2.gir $(irscanner_headers)
 
 BUILT_GIRSOURCES += Indicate-Gtk-0.2.gir

=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2010-03-01 04:43:14 +0000
+++ libindicate/Makefile.am	2010-03-09 17:20:33 +0000
@@ -119,7 +119,8 @@
 		--include=GObject-2.0 \
 		--include=GLib-2.0 \
 		--include=DbusmenuGlib-0.2 \
-		--library=indicate --pkg indicate \
+		--library=indicate \
+		$(LIBINDICATE_CFLAGS) -I $(srcdir) -I $(top_srcdir) \
 		--output Indicate-0.2.gir $(irscanner_headers)
 
 BUILT_GIRSOURCES += Indicate-0.2.gir