gnome-applets r11160 - in trunk: accessx-status battstat charpick drivemount geyes gswitchit gweather mixer stickynotes trashapplet trashapplet/src

[mccann svn gnome org]

Author: mccann
Date: Wed Dec 17 15:55:34 2008
New Revision: 11160
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11160&view=rev

Log:
2008-12-17  William Jon McCann  <jmccann redhat com>

	* Makefile.am: Add missing libgnomeui CFLAGS
	Patch from: lucasr at mundo gmail com
	(Bug #564192)



Modified:
   trunk/accessx-status/ChangeLog
   trunk/accessx-status/Makefile.am
   trunk/battstat/ChangeLog
   trunk/battstat/Makefile.am
   trunk/charpick/ChangeLog
   trunk/charpick/Makefile.am
   trunk/drivemount/ChangeLog
   trunk/drivemount/Makefile.am
   trunk/geyes/ChangeLog
   trunk/geyes/Makefile.am
   trunk/gswitchit/ChangeLog
   trunk/gswitchit/Makefile.am
   trunk/gweather/ChangeLog
   trunk/gweather/Makefile.am
   trunk/mixer/ChangeLog
   trunk/mixer/Makefile.am
   trunk/stickynotes/ChangeLog
   trunk/stickynotes/Makefile.am
   trunk/trashapplet/ChangeLog
   trunk/trashapplet/src/Makefile.am

Modified: trunk/accessx-status/Makefile.am
==============================================================================
--- trunk/accessx-status/Makefile.am	(original)
+++ trunk/accessx-status/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -1,6 +1,8 @@
 SUBDIRS = docs pixmaps
 
-INCLUDES = $(GNOME_APPLETS_CFLAGS)
+INCLUDES = \
+	$(GNOME_APPLETS_CFLAGS)	\
+	$(GNOME_LIBS2_CFLAGS)
 
 libexec_PROGRAMS = accessx-status-applet
 
@@ -10,6 +12,7 @@
 
 accessx_status_applet_LDADD = \
 	$(GNOME_APPLETS_LIBS) \
+	$(GNOME_LIBS2_LIBS) \
         $(X_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers

Modified: trunk/battstat/Makefile.am
==============================================================================
--- trunk/battstat/Makefile.am	(original)
+++ trunk/battstat/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -25,6 +25,7 @@
 
 INCLUDES =					\
 	$(GNOME_APPLETS_CFLAGS)			\
+	$(GNOME_LIBS2_CFLAGS)			\
 	$(LIBNOTIFY_CFLAGS)			\
 	$(HAL_CFLAGS)				\
 	$(APMINC)				\
@@ -51,6 +52,7 @@
 
 battstat_applet_2_LDADD = \
 		     $(GNOME_APPLETS_LIBS) \
+		     $(GNOME_LIBS2_LIBS) \
 		     $(LIBNOTIFY_LIBS) \
 		     $(HAL_LIBS) \
 		     $(APMLIB)

Modified: trunk/charpick/Makefile.am
==============================================================================
--- trunk/charpick/Makefile.am	(original)
+++ trunk/charpick/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -4,6 +4,7 @@
 	-I.			\
 	-I$(srcdir)		\
 	$(GNOME_APPLETS_CFLAGS)	\
+	$(GNOME_LIBS2_CFLAGS)	\
 	$(GUCHARMAP_CFLAGS)
 
 libexec_PROGRAMS = charpick_applet2
@@ -14,6 +15,7 @@
 
 charpick_applet2_LDADD = \
 		       $(GNOME_APPLETS_LIBS)	\
+		       $(GNOME_LIBS2_LIBS)	\
 		       $(GUCHARMAP_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers

Modified: trunk/drivemount/Makefile.am
==============================================================================
--- trunk/drivemount/Makefile.am	(original)
+++ trunk/drivemount/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -3,7 +3,8 @@
 INCLUDES =			\
 	-I.			\
 	-I$(srcdir)		\
-	$(GNOME_APPLETS_CFLAGS) 
+	$(GNOME_APPLETS_CFLAGS)	\
+	$(GNOME_LIBS2_CFLAGS)
 
 libexec_PROGRAMS = drivemount_applet2
 
@@ -15,7 +16,8 @@
 	drive-button.h
 
 drivemount_applet2_LDADD =	\
-	$(GNOME_APPLETS_LIBS) 
+	$(GNOME_APPLETS_LIBS)	\ 
+	$(GNOME_LIBS2_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_DriveMountApplet.server.in

Modified: trunk/geyes/Makefile.am
==============================================================================
--- trunk/geyes/Makefile.am	(original)
+++ trunk/geyes/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -4,6 +4,7 @@
 	-I.						\
 	-I$(srcdir) 					\
 	$(GNOME_APPLETS_CFLAGS)				\
+	$(GNOME_LIBS2_CFLAGS)				\
 	-I$(includedir) 				\
 	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"
 
@@ -14,8 +15,9 @@
 	themes.c \
 	geyes.h
 
-geyes_applet2_LDADD = \
-	$(GNOME_APPLETS_LIBS)
+geyes_applet2_LDADD = 		\
+	$(GNOME_APPLETS_LIBS)	\
+	$(GNOME_LIBS2_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_GeyesApplet.server.in

Modified: trunk/gswitchit/Makefile.am
==============================================================================
--- trunk/gswitchit/Makefile.am	(original)
+++ trunk/gswitchit/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -23,10 +23,12 @@
 	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
 	$(LIBGNOMEKBDUI_CFLAGS)		\
 	$(GNOME_APPLETS_CFLAGS)		\
+	$(GNOME_LIBS2_CFLAGS)		\
 	$(flags_CFLAGS)	
 
 COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
-	      $(GNOME_APPLETS_LIBS)
+	      $(GNOME_APPLETS_LIBS) \
+	      $(GNOME_LIBS2_LIBS)
 
 libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
 

Modified: trunk/gweather/Makefile.am
==============================================================================
--- trunk/gweather/Makefile.am	(original)
+++ trunk/gweather/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -7,6 +7,7 @@
 	-I$(top_srcdir)			\
 	-DGTK_ENABLE_BROKEN		\
 	$(GNOME_APPLETS_CFLAGS)		\
+	$(GNOME_LIBS2_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\
 	$(LIBGWEATHER_CFLAGS)		\
 	$(NETWORKMANAGER_CFLAGS)
@@ -24,6 +25,7 @@
 gweather_applet_2_LDADD = 	\
 	$(LIBNOTIFY_LIBS) 	\
 	$(GNOME_APPLETS_LIBS)	\
+	$(GNOME_LIBS2_LIBS)	\
 	$(LIBGWEATHER_LIBS) 	\
 	$(NETWORKMANAGER_LIBS)
 

Modified: trunk/mixer/Makefile.am
==============================================================================
--- trunk/mixer/Makefile.am	(original)
+++ trunk/mixer/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -3,6 +3,7 @@
 INCLUDES = -I. -I$(srcdir) 		\
 	$(MIXER_CFLAGS)			\
 	$(GNOME_APPLETS_CFLAGS)		\
+	$(GNOME_LIBS2_CFLAGS)		\
 	$(GNOMEDESKTOP_CFLAGS)
 
 libexec_PROGRAMS = mixer_applet2
@@ -22,6 +23,7 @@
 mixer_applet2_LDADD = 					\
 	$(MIXER_LIBS) 					\
 	$(GNOME_APPLETS_LIBS)				\
+	$(GNOME_LIBS2_LIBS)				\
 	$(GNOMEDESKTOP_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers

Modified: trunk/stickynotes/Makefile.am
==============================================================================
--- trunk/stickynotes/Makefile.am	(original)
+++ trunk/stickynotes/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -12,6 +12,7 @@
 	-I.					\
 	-I$(srcdir)				\
 	$(GNOME_APPLETS_CFLAGS)			\
+	$(GNOME_LIBS2_CFLAGS)			\
 	$(LIBWNCK_CFLAGS)			\
 	$(XML2_CFLAGS)				\
 	-DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
@@ -33,6 +34,7 @@
 stickynotes_applet_LDADD =	\
 	$(GNOME_APPLETS_LIBS)	\
 	$(LIBWNCK_LIBS)		\
+	$(GNOME_LIBS2_LIBS)	\
 	$(XML2_LIBS)
 
 builder_DATA = $(builder_files)

Modified: trunk/trashapplet/src/Makefile.am
==============================================================================
--- trunk/trashapplet/src/Makefile.am	(original)
+++ trunk/trashapplet/src/Makefile.am	Wed Dec 17 15:55:34 2008
@@ -1,5 +1,6 @@
 INCLUDES = -I$(top_srcdir)		\
 	   $(GNOME_APPLETS_CFLAGS)	\
+	   $(GNOME_LIBS2_CFLAGS)	\
 	   $(GIO_CFLAGS)
 
 libexec_PROGRAMS = trashapplet
@@ -13,4 +14,5 @@
 
 trashapplet_LDADD = 		\
 	$(GNOME_APPLETS_LIBS) 	\
+	$(GNOME_LIBS2_LIBS)	\
 	$(GIO_LIBS)