GNOME.org
 

[gnome-applets] Fix CFLAGS and LIBS to reflect that we're only about GNOME 3 now

commit 26af3f70a0e3782081be3788029dfa06771e2dea
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Jan 9 11:47:41 2011 +0100

    Fix CFLAGS and LIBS to reflect that we're only about GNOME 3 now

 accessx-status/Makefile.am     |   11 ++++++++---
 battstat/Makefile.am           |    5 +++--
 charpick/Makefile.am           |    4 ++--
 cpufreq/src/Makefile.am        |    9 +++++----
 geyes/Makefile.am              |    4 ++--
 gweather/Makefile.am           |    7 ++++---
 mini-commander/src/Makefile.am |    4 ++--
 mixer/Makefile.am              |    5 +++--
 modemlights/Makefile.am        |    5 +++--
 multiload/Makefile.am          |    4 ++--
 stickynotes/Makefile.am        |    5 +++--
 trashapplet/src/Makefile.am    |    5 +++--
 12 files changed, 40 insertions(+), 28 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index c725c05..8c48190 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -1,7 +1,10 @@
 SUBDIRS = docs pixmaps
 
 INCLUDES = \
-	$(GNOME_APPLETS3_CFLAGS) \
+	$(GNOME_APPLETS_CFLAGS) \
+	$(GIO_CFLAGS)		\
+	$(GIO_UNIX_CFLAGS)	\
+	$(WARN_CFLAGS)		\
 	-DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\" \
 	-DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
 
@@ -11,8 +14,10 @@ accessx_status_applet_SOURCES = \
 	applet.c \
 	applet.h
 
-accessx_status_applet_LDADD = \
-	$(GNOME_APPLETS3_LIBS) \
+accessx_status_applet_LDADD =	\
+	$(GNOME_APPLETS_LIBS)	\
+	$(GIO_LIBS)		\
+	$(GIO_UNIX_LIBS)	\
         $(X_LIBS)
 
 appletdir       = $(datadir)/gnome-panel/applets
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 1953246..d50fdef 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -24,11 +24,12 @@ SUBDIRS = docs sounds $(APMDIR)
 DIST_SUBDIRS = docs sounds apmlib
 
 INCLUDES =					\
-	$(GNOME_APPLETS3_CFLAGS)		\
+	$(GNOME_APPLETS_CFLAGS)			\
 	$(LIBNOTIFY_CFLAGS)			\
 	$(HAL_CFLAGS)				\
 	$(APMINC)				\
 	$(ACPIINC)				\
+	$(WARN_CFLAGS)				\
 	-DG_LOG_DOMAIN=\"battstat_applet\"	\
 	-DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
 
@@ -51,7 +52,7 @@ battstat_applet_2_SOURCES = \
 
 
 battstat_applet_2_LDADD = \
-		     $(GNOME_APPLETS3_LIBS) \
+		     $(GNOME_APPLETS_LIBS) \
 		     $(LIBNOTIFY_LIBS) \
 		     $(HAL_LIBS) \
 		     $(APMLIB)
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 9093db1..4d31cb0 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =					\
 	-I.					\
 	-I$(srcdir)				\
 	-DCHARPICK_MENU_UI_DIR=\""$(uidir)"\"	\
-	$(GNOME_APPLETS3_CFLAGS)		\
+	$(GNOME_APPLETS_CFLAGS)		\
 	$(GUCHARMAP_CFLAGS)
 
 libexec_PROGRAMS = charpick_applet2
@@ -14,7 +14,7 @@ charpick_applet2_SOURCES = charpick.c \
                           properties.c
 
 charpick_applet2_LDADD = \
-		       $(GNOME_APPLETS3_LIBS)	\
+		       $(GNOME_APPLETS_LIBS)	\
 		       $(GUCHARMAP_LIBS)
 
 appletdir       = $(datadir)/gnome-panel/applets
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index e4439d7..035b057 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -5,10 +5,11 @@ endif
 SUBDIRS = $(selector_SUBDIR)
 
 INCLUDES = \
-	-DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\" 	\
-	$(GNOME_APPLETS3_CFLAGS) 				\
+	-DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\" 		\
+	$(GNOME_APPLETS_CFLAGS) 				\
 	$(LIBGLADE_CFLAGS)					\
-	$(DBUS_CFLAGS)
+	$(DBUS_CFLAGS)						\
+	$(WARN_CFLAGS)
 
 libexec_PROGRAMS = cpufreq-applet
 
@@ -30,7 +31,7 @@ cpufreq_applet_SOURCES =  \
 	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
 
 cpufreq_applet_LDADD =  \
-	$(GNOME_APPLETS3_LIBS)   	\
+	$(GNOME_APPLETS_LIBS)   	\
 	$(LIBGLADE_LIBS)		\
 	$(LIBCPUFREQ_LIBS)		\
 	$(DBUS_LIBS)
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 9b76d77..e0bd844 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = themes docs
 INCLUDES =						\
 	-I.						\
 	-I$(srcdir) 					\
-	$(GNOME_APPLETS3_CFLAGS)			\
+	$(GNOME_APPLETS_CFLAGS)				\
 	-I$(includedir) 				\
 	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"	\
 	-DGEYES_MENU_UI_DIR=\""$(uidir)"\"
@@ -16,7 +16,7 @@ geyes_applet2_SOURCES =	\
 	geyes.h
 
 geyes_applet2_LDADD = 		\
-	$(GNOME_APPLETS3_LIBS)
+	$(GNOME_APPLETS_LIBS)
 
 appletdir       = $(datadir)/gnome-panel/applets
 applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index 27f784a..1e02bc9 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -7,11 +7,12 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-DGWEATHER_MENU_UI_DIR=\""$(uidir)"\"	\
 	$(DBUS_CFLAGS)				\
-	$(GNOME_APPLETS3_CFLAGS)		\
+	$(GNOME_APPLETS_CFLAGS)		\
 	$(DBUS_CFLAGS)				\
 	$(LIBNOTIFY_CFLAGS)			\
 	$(LIBGWEATHER_CFLAGS)			\
-	$(NETWORKMANAGER_CFLAGS)
+	$(NETWORKMANAGER_CFLAGS)		\
+	$(WARN_CFLAGS)
 
 libexec_PROGRAMS = gweather-applet-2
 
@@ -26,7 +27,7 @@ gweather_applet_2_SOURCES = \
 gweather_applet_2_LDADD = 	\
 	$(DBUS_LIBS)		\
 	$(LIBNOTIFY_LIBS) 	\
-	$(GNOME_APPLETS3_LIBS)	\
+	$(GNOME_APPLETS_LIBS)	\
 	$(DBUS_LIBS)		\
 	$(GNOME_LIBS2_LIBS)	\
 	$(LIBGWEATHER_LIBS) 	\
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index b5dd10e..f4ef252 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = 				\
 	-I.				\
 	-I$(srcdir)			\
 	-DMC_MENU_UI_DIR=\""$(uidir)"\"	\
-	$(GNOME_APPLETS3_CFLAGS)	\
+	$(GNOME_APPLETS_CFLAGS)	\
 	$(WARN_CFLAGS)			\
 	$(GNOME_INCLUDEDIR)
 
@@ -35,7 +35,7 @@ mini_commander_applet_SOURCES =			\
 	mc-default-macros.h
 
 mini_commander_applet_LDADD =	\
-	$(GNOME_APPLETS3_LIBS)
+	$(GNOME_APPLETS_LIBS)
 
 mc_install_default_macros_SOURCES =	\
 	mc-install-default-macros.c	\
diff --git a/mixer/Makefile.am b/mixer/Makefile.am
index 692131a..e49d718 100644
--- a/mixer/Makefile.am
+++ b/mixer/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = docs
 INCLUDES = -I. -I$(srcdir) 			\
 	-DMIXER_MENU_UI_DIR=\""$(uidir)"\"	\
 	$(MIXER_CFLAGS)				\
-	$(GNOME_APPLETS3_CFLAGS)
+	$(GNOME_APPLETS_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libexec_PROGRAMS = mixer_applet2
 
@@ -21,7 +22,7 @@ noinst_HEADERS = \
 
 mixer_applet2_LDADD = 					\
 	$(MIXER_LIBS) 					\
-	$(GNOME_APPLETS3_LIBS)
+	$(GNOME_APPLETS_LIBS)
 
 appletdir       = $(datadir)/gnome-panel/applets
 applet_in_files = org.gnome.applets.MixerApplet.panel-applet.in
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index cb692ee..58b4a70 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -2,7 +2,8 @@
 
 INCLUDES = -I. -I$(srcdir) 				\
 	-DMODEM_MENU_UI_DIR=\""$(uidir)"\"		\
-	$(GNOME_APPLETS3_CFLAGS)
+	$(GNOME_APPLETS_CFLAGS)				\
+	$(WARN_CFLAGS)
 
 libexec_PROGRAMS = modem_applet
 
@@ -11,7 +12,7 @@ modem_applet_SOURCES = \
 	modem-applet.h
 
 modem_applet_LDADD = 		\
-	$(GNOME_APPLETS3_LIBS)	\
+	$(GNOME_APPLETS_LIBS)	\
 	$(MODEMLIGHTS_LIBS)
 
 uidir	= $(datadir)/gnome-2.0/ui
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 9aa9a39..3c838ad 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = docs
 INCLUDES =			\
 	-I$(srcdir)		\
 	-DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
-	$(GNOME_APPLETS3_CFLAGS)	\
+	$(GNOME_APPLETS_CFLAGS)	\
 	$(GTOP_APPLETS_CFLAGS)	\
 	$(GIO_UNIX_CFLAGS)
 
@@ -22,7 +22,7 @@ multiload_applet_2_SOURCES = \
 			autoscaler.h
 
 multiload_applet_2_LDADD = \
-				$(GNOME_APPLETS3_LIBS) 	\
+				$(GNOME_APPLETS_LIBS) 	\
 				$(GTOP_APPLETS_LIBS)	\
 				$(GIO_UNIX_LIBS)
 
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 212d210..0e62013 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -12,9 +12,10 @@ if BUILD_STICKYNOTES_APPLET
 INCLUDES =					\
 	-I.					\
 	-I$(srcdir)				\
-	$(GNOME_APPLETS3_CFLAGS)		\
+	$(GNOME_APPLETS_CFLAGS)			\
 	$(LIBWNCK_CFLAGS)			\
 	$(XML2_CFLAGS)				\
+	$(WARN_CFLAGS)				\
 	-DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
 	-DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
 
@@ -33,7 +34,7 @@ stickynotes_applet_SOURCES = \
 	stickynotes_applet_callbacks.c
 
 stickynotes_applet_LDADD =	\
-	$(GNOME_APPLETS3_LIBS)	\
+	$(GNOME_APPLETS_LIBS)	\
 	$(LIBWNCK_LIBS)		\
 	$(XML2_LIBS)
 
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index 34523d1..3a1cf26 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)		\
-	   $(GNOME_APPLETS3_CFLAGS)	\
+	   $(GNOME_APPLETS_CFLAGS)	\
 	   $(GIO_CFLAGS)		\
+	   $(WARN_CFLAGS)		\
            -DTRASH_MENU_UI_DIR=\""$(pkgdatadir)/ui"\"
 
 libexec_PROGRAMS = trashapplet
@@ -13,7 +14,7 @@ trashapplet_SOURCES = \
 	xstuff.h
 
 trashapplet_LDADD = 		\
-	$(GNOME_APPLETS3_LIBS) 	\
+	$(GNOME_APPLETS_LIBS) 	\
 	$(GIO_LIBS)
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]