52fc8a8
diff -up gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui gnome-applets-2.25.1/accessx-status/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui	2008-06-11 02:34:20.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/accessx-status/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -1,6 +1,8 @@
52fc8a8
 SUBDIRS = docs pixmaps
52fc8a8
 
52fc8a8
-INCLUDES = $(GNOME_APPLETS_CFLAGS)
52fc8a8
+INCLUDES = \
52fc8a8
+	$(GNOME_APPLETS_CFLAGS)	\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)
52fc8a8
 
52fc8a8
 libexec_PROGRAMS = accessx-status-applet
52fc8a8
 
52fc8a8
@@ -10,6 +12,7 @@ accessx_status_applet_SOURCES = \
52fc8a8
 
52fc8a8
 accessx_status_applet_LDADD = \
52fc8a8
 	$(GNOME_APPLETS_LIBS) \
52fc8a8
+	$(GNOME_LIBS2_LIBS) \
52fc8a8
         $(X_LIBS)
52fc8a8
 
52fc8a8
 serverdir       = $(libdir)/bonobo/servers
52fc8a8
diff -up gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui gnome-applets-2.25.1/charpick/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui	2008-06-11 02:31:27.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/charpick/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -4,6 +4,7 @@ INCLUDES =			\
52fc8a8
 	-I.			\
52fc8a8
 	-I$(srcdir)		\
52fc8a8
 	$(GNOME_APPLETS_CFLAGS)	\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)	\
52fc8a8
 	$(GUCHARMAP_CFLAGS)
52fc8a8
 
52fc8a8
 libexec_PROGRAMS = charpick_applet2
52fc8a8
@@ -14,6 +15,7 @@ charpick_applet2_SOURCES = charpick.c \
52fc8a8
 
52fc8a8
 charpick_applet2_LDADD = \
52fc8a8
 		       $(GNOME_APPLETS_LIBS)	\
52fc8a8
+		       $(GNOME_LIBS2_LIBS)	\
52fc8a8
 		       $(GUCHARMAP_LIBS)
52fc8a8
 
52fc8a8
 serverdir       = $(libdir)/bonobo/servers
52fc8a8
diff -up gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui gnome-applets-2.25.1/cpufreq/src/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui	2008-12-19 01:10:06.000000000 -0500
52fc8a8
+++ gnome-applets-2.25.1/cpufreq/src/Makefile.am	2008-12-19 01:10:29.000000000 -0500
52fc8a8
@@ -6,6 +6,7 @@ SUBDIRS = $(selector_SUBDIR)
52fc8a8
 
52fc8a8
 INCLUDES = \
52fc8a8
 	$(GNOME_APPLETS_CFLAGS) 				\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)					\
52fc8a8
 	$(LIBGLADE_CFLAGS)
52fc8a8
 
52fc8a8
 if HAVE_POLKIT_GNOME
52fc8a8
@@ -33,6 +34,7 @@ cpufreq_applet_SOURCES =  \
52fc8a8
 
52fc8a8
 cpufreq_applet_LDADD =  \
52fc8a8
 	$(GNOME_APPLETS_LIBS)   	\
52fc8a8
+	$(GNOME_LIBS2_LIBS)		\
52fc8a8
 	$(LIBGLADE_LIBS)		\
52fc8a8
 	$(LIBCPUFREQ_LIBS)
52fc8a8
 
52fc8a8
diff -up gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui gnome-applets-2.25.1/drivemount/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui	2008-06-11 02:32:46.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/drivemount/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -3,7 +3,8 @@ SUBDIRS = help
52fc8a8
 INCLUDES =			\
52fc8a8
 	-I.			\
52fc8a8
 	-I$(srcdir)		\
52fc8a8
-	$(GNOME_APPLETS_CFLAGS) 
52fc8a8
+	$(GNOME_APPLETS_CFLAGS)	\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)
52fc8a8
 
52fc8a8
 libexec_PROGRAMS = drivemount_applet2
52fc8a8
 
52fc8a8
@@ -15,7 +16,8 @@ drivemount_applet2_SOURCES =	\
52fc8a8
 	drive-button.h
52fc8a8
 
52fc8a8
 drivemount_applet2_LDADD =	\
52fc8a8
-	$(GNOME_APPLETS_LIBS) 
52fc8a8
+	$(GNOME_APPLETS_LIBS)	\ 
52fc8a8
+	$(GNOME_LIBS2_LIBS)
52fc8a8
 
52fc8a8
 serverdir       = $(libdir)/bonobo/servers
52fc8a8
 server_in_files = GNOME_DriveMountApplet.server.in
52fc8a8
diff -up gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui gnome-applets-2.25.1/geyes/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui	2008-09-02 05:56:54.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/geyes/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -4,6 +4,7 @@ INCLUDES =						\
52fc8a8
 	-I.						\
52fc8a8
 	-I$(srcdir) 					\
52fc8a8
 	$(GNOME_APPLETS_CFLAGS)				\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)				\
52fc8a8
 	-I$(includedir) 				\
52fc8a8
 	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"
52fc8a8
 
52fc8a8
@@ -14,8 +15,9 @@ geyes_applet2_SOURCES =	\
52fc8a8
 	themes.c \
52fc8a8
 	geyes.h
52fc8a8
 
52fc8a8
-geyes_applet2_LDADD = \
52fc8a8
-	$(GNOME_APPLETS_LIBS)
52fc8a8
+geyes_applet2_LDADD = 		\
52fc8a8
+	$(GNOME_APPLETS_LIBS)	\
52fc8a8
+	$(GNOME_LIBS2_LIBS)
52fc8a8
 
52fc8a8
 serverdir       = $(libdir)/bonobo/servers
52fc8a8
 server_in_files = GNOME_GeyesApplet.server.in
52fc8a8
diff -up gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui gnome-applets-2.25.1/gswitchit/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui	2008-06-11 02:27:32.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/gswitchit/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -23,10 +23,12 @@ COMMON_CFLAGS =				\
52fc8a8
 	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
52fc8a8
 	$(LIBGNOMEKBDUI_CFLAGS)		\
52fc8a8
 	$(GNOME_APPLETS_CFLAGS)		\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)		\
52fc8a8
 	$(flags_CFLAGS)	
52fc8a8
 
52fc8a8
 COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
52fc8a8
-	      $(GNOME_APPLETS_LIBS)
52fc8a8
+	      $(GNOME_APPLETS_LIBS) \
52fc8a8
+	      $(GNOME_LIBS2_LIBS)
52fc8a8
 
52fc8a8
 libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
52fc8a8
 
52fc8a8
diff -up gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui gnome-applets-2.25.1/gweather/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui	2008-09-04 19:19:02.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/gweather/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -7,8 +7,10 @@ INCLUDES =				\
52fc8a8
 	-I$(top_srcdir)			\
52fc8a8
 	-DGTK_ENABLE_BROKEN		\
52fc8a8
 	$(GNOME_APPLETS_CFLAGS)		\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)		\
52fc8a8
 	$(LIBNOTIFY_CFLAGS)		\
52fc8a8
-	$(LIBGWEATHER_CFLAGS)
52fc8a8
+	$(LIBGWEATHER_CFLAGS)		\
52fc8a8
+	$(NETWORKMANAGER_CFLAGS)
52fc8a8
 
52fc8a8
 libexec_PROGRAMS = gweather-applet-2
52fc8a8
 
52fc8a8
@@ -20,10 +22,12 @@ gweather_applet_2_SOURCES = \
52fc8a8
 	gweather-dialog.c gweather-dialog.h \
52fc8a8
 	gweather-applet.c gweather-applet.h
52fc8a8
 
52fc8a8
-gweather_applet_2_LDADD = \
52fc8a8
-	$(LIBNOTIFY_LIBS) \
52fc8a8
+gweather_applet_2_LDADD = 	\
52fc8a8
+	$(LIBNOTIFY_LIBS) 	\
52fc8a8
 	$(GNOME_APPLETS_LIBS)	\
52fc8a8
-	$(LIBGWEATHER_LIBS)
52fc8a8
+	$(GNOME_LIBS2_LIBS)	\
52fc8a8
+	$(LIBGWEATHER_LIBS) 	\
52fc8a8
+	$(NETWORKMANAGER_LIBS)
52fc8a8
 
52fc8a8
 uidir = $(datadir)/gnome-2.0/ui
52fc8a8
 ui_DATA = GNOME_GWeatherApplet.xml
52fc8a8
diff -up gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.1/mini-commander/src/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui	2008-09-02 05:56:55.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/mini-commander/src/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -4,6 +4,7 @@ INCLUDES = 				\
52fc8a8
 	-I.				\
52fc8a8
 	-I$(srcdir)			\
52fc8a8
 	$(GNOME_APPLETS_CFLAGS)		\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)		\
52fc8a8
 	$(WARN_CFLAGS)			\
52fc8a8
 	$(GNOME_INCLUDEDIR)
52fc8a8
 
52fc8a8
@@ -34,6 +35,7 @@ mini_commander_applet_SOURCES =			\
52fc8a8
 	mc-default-macros.h
52fc8a8
 
52fc8a8
 mini_commander_applet_LDADD =	\
52fc8a8
+	$(GNOME_LIBS2_LIBS)	\	
52fc8a8
 	$(GNOME_APPLETS_LIBS)
52fc8a8
 
52fc8a8
 mc_install_default_macros_SOURCES =	\
52fc8a8
diff -up gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.1/modemlights/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui	2004-11-04 06:44:55.000000000 -0500
52fc8a8
+++ gnome-applets-2.25.1/modemlights/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -2,6 +2,7 @@ SUBDIRS = docs
52fc8a8
 
52fc8a8
 INCLUDES = -I. -I$(srcdir) 				\
52fc8a8
 	$(GNOME_APPLETS_CFLAGS)				\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)				\
52fc8a8
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
52fc8a8
 	-DVERSION=\""$(VERSION)"\"
52fc8a8
 
52fc8a8
@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
52fc8a8
 	properties.c
52fc8a8
 
52fc8a8
 modemlights_applet2_LDADD = \
52fc8a8
+		     $(GNOME_LIBS2_LIBS) \
52fc8a8
 		     $(GNOME_APPLETS_LIBS)
52fc8a8
 
52fc8a8
 uidir		= $(datadir)/gnome-2.0/ui
52fc8a8
diff -up gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui gnome-applets-2.25.1/stickynotes/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui	2008-09-29 20:27:02.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/stickynotes/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -12,6 +12,7 @@ INCLUDES =					\
52fc8a8
 	-I.					\
52fc8a8
 	-I$(srcdir)				\
52fc8a8
 	$(GNOME_APPLETS_CFLAGS)			\
52fc8a8
+	$(GNOME_LIBS2_CFLAGS)			\
52fc8a8
 	$(LIBWNCK_CFLAGS)			\
52fc8a8
 	$(XML2_CFLAGS)				\
52fc8a8
 	-DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
52fc8a8
@@ -33,6 +34,7 @@ stickynotes_applet_SOURCES = \
52fc8a8
 stickynotes_applet_LDADD =	\
52fc8a8
 	$(GNOME_APPLETS_LIBS)	\
52fc8a8
 	$(LIBWNCK_LIBS)		\
52fc8a8
+	$(GNOME_LIBS2_LIBS)	\
52fc8a8
 	$(XML2_LIBS)
52fc8a8
 
52fc8a8
 builder_DATA = $(builder_files)
52fc8a8
diff -up gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui gnome-applets-2.25.1/trashapplet/src/Makefile.am
52fc8a8
--- gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui	2008-06-11 02:26:42.000000000 -0400
52fc8a8
+++ gnome-applets-2.25.1/trashapplet/src/Makefile.am	2008-12-19 01:07:09.000000000 -0500
52fc8a8
@@ -1,5 +1,6 @@
52fc8a8
 INCLUDES = -I$(top_srcdir)		\
52fc8a8
 	   $(GNOME_APPLETS_CFLAGS)	\
52fc8a8
+	   $(GNOME_LIBS2_CFLAGS)	\
52fc8a8
 	   $(GIO_CFLAGS)
52fc8a8
 
52fc8a8
 libexec_PROGRAMS = trashapplet
52fc8a8
@@ -13,4 +14,5 @@ trashapplet_SOURCES = \
52fc8a8
 
52fc8a8
 trashapplet_LDADD = 		\
52fc8a8
 	$(GNOME_APPLETS_LIBS) 	\
52fc8a8
+	$(GNOME_LIBS2_LIBS)	\
52fc8a8
 	$(GIO_LIBS)