summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-05-17 23:53:37 +0200
committerraveit65 <[email protected]>2020-05-21 20:22:59 +0200
commitc77596c251b9964d177b72f4aea8139be31d1bfa (patch)
tree2fc9842e79deefd32c2440a723faa13c5dccf7f8
parentc05e8a98283929fd7cd97889a96756b57ee79839 (diff)
downloadmate-applets-c77596c251b9964d177b72f4aea8139be31d1bfa.tar.bz2
mate-applets-c77596c251b9964d177b72f4aea8139be31d1bfa.tar.xz
build: Remove MATEDESKTOP_CFLAGS and MATEDESKTOP_LIBS
-rw-r--r--accessx-status/Makefile.am2
-rw-r--r--battstat/Makefile.am2
-rw-r--r--charpick/Makefile.am2
-rw-r--r--command/Makefile.am3
-rw-r--r--cpufreq/src/Makefile.am4
-rw-r--r--drivemount/Makefile.am6
-rw-r--r--geyes/Makefile.am2
-rw-r--r--mateweather/Makefile.am2
-rw-r--r--multiload/Makefile.am2
-rw-r--r--netspeed/src/Makefile.am3
-rw-r--r--stickynotes/Makefile.am2
-rw-r--r--timerapplet/Makefile.am3
-rw-r--r--trashapplet/src/Makefile.am2
13 files changed, 6 insertions, 29 deletions
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 0193fbe0..f71ab438 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = docs pixmaps
AM_CPPFLAGS = \
${WARN_CFLAGS} \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(GIO_CFLAGS) \
-DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/mate-accessx-status-applet"\" \
-DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
@@ -16,7 +15,6 @@ accessx_status_applet_SOURCES = \
accessx_status_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(GIO_LIBS) \
$(X_LIBS)
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 6d8b3af8..35ed3aa9 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -26,7 +26,6 @@ DIST_SUBDIRS = docs sounds apmlib
AM_CPPFLAGS = \
${WARN_CFLAGS} \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(UPOWER_CFLAGS) \
$(APMINC) \
@@ -53,7 +52,6 @@ battstat_applet_SOURCES = \
battstat_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(LIBNOTIFY_LIBS) \
$(APMLIB) \
$(UPOWER_LIBS) \
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 8f6914ad..5397d2d0 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
-DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \
${WARN_CFLAGS} \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(GUCHARMAP_CFLAGS)
libexec_PROGRAMS = mate-charpick-applet
@@ -17,7 +16,6 @@ mate_charpick_applet_SOURCES = charpick.c \
mate_charpick_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(GUCHARMAP_LIBS)
appletdir = $(datadir)/mate-panel/applets
diff --git a/command/Makefile.am b/command/Makefile.am
index 4bc5b4e3..fbb3a141 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
-I$(srcdir) \
$(DISABLE_DEPRECATED_CFLAGS)
@@ -8,7 +7,7 @@ APPLET_LOCATION = $(libexecdir)/command-applet
libexec_PROGRAMS = command-applet
command_applet_SOURCES = command.c ma-command.c ma-command.h
-command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
+command_applet_LDADD = $(MATE_APPLETS4_LIBS)
command_applet_CFLAGS = $(WARN_CFLAGS)
appletsdir = $(datadir)/mate-panel/applets
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index bfa6fd48..af5982f9 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -6,8 +6,7 @@ SUBDIRS = $(selector_SUBDIR)
AM_CPPFLAGS = \
-DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate/ui"\" \
- $(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS)
+ $(MATE_APPLETS4_CFLAGS)
if HAVE_DBUS
AM_CPPFLAGS += $(DBUS_CFLAGS)
@@ -37,7 +36,6 @@ mate_cpufreq_applet_CFLAGS = \
mate_cpufreq_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(LIBCPUFREQ_LIBS)
if HAVE_DBUS
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 7e74702d..a33779bd 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -5,8 +5,7 @@ AM_CPPFLAGS = \
-I$(srcdir) \
-DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
${WARN_CFLAGS} \
- $(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS)
+ $(MATE_APPLETS4_CFLAGS)
libexec_PROGRAMS = mate-drivemount-applet
@@ -18,8 +17,7 @@ mate_drivemount_applet_SOURCES = \
drive-button.h
mate_drivemount_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS)
+ $(MATE_APPLETS4_LIBS)
uidir = $(datadir)/mate/ui
ui_DATA = drivemount-applet-menu.xml
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index f226f218..e3c43bcd 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
-I$(includedir) \
-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \
-DGEYES_MENU_UI_DIR=\""$(uidir)"\" \
@@ -19,7 +18,6 @@ mate_geyes_applet_SOURCES = \
mate_geyes_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
-lm
appletdir = $(datadir)/mate-panel/applets
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index 467f6d8c..dd80e547 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DMATEWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(LIBMATEWEATHER_CFLAGS) \
${WARN_CFLAGS}
@@ -25,7 +24,6 @@ mateweather_applet_SOURCES = \
mateweather_applet_LDADD = \
$(LIBNOTIFY_LIBS) \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(MATE_LIBS2_LIBS) \
$(LIBMATEWEATHER_LIBS)
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index c3df77d5..ae48940a 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
$(MATE_APPLETS4_CFLAGS) \
$(GTOP_APPLETS_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(GIO_CFLAGS) \
${WARN_CFLAGS}
@@ -26,7 +25,6 @@ mate_multiload_applet_SOURCES = \
mate_multiload_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
$(GTOP_APPLETS_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(GIO_LIBS) \
-lm
diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am
index 06574ebe..27fb82d3 100644
--- a/netspeed/src/Makefile.am
+++ b/netspeed/src/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
$(GIO_CFLAGS) \
$(GTOP_APPLETS_CFLAGS) \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
-DNETSPEED_MENU_UI_DIR=\""$(datadir)/mate/ui"\" \
${WARN_CFLAGS}
@@ -13,7 +12,7 @@ libexec_PROGRAMS = mate-netspeed-applet
mate_netspeed_applet_SOURCES = backend.h backend.c netspeed.c
mate_netspeed_applet_LDADD = $(GIO_LIBS) $(GTOP_APPLETS_LIBS) \
- $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) \
+ $(MATE_APPLETS4_LIBS) \
$(IWLIB) $(INTLLIBS) -lm
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index a67506bd..6cc2c530 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS = \
-I$(srcdir) \
$(STICKYNOTES_CFLAGS) \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(LIBWNCK_CFLAGS) \
$(XML2_CFLAGS) \
-DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\" \
@@ -47,7 +46,6 @@ stickynotes_applet_SOURCES = \
stickynotes_applet_LDADD = \
$(STICKYNOTES_LIBS) \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(LIBWNCK_LIBS) \
$(XML2_LIBS) \
-lX11 \
diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am
index 08552191..7a69c74a 100644
--- a/timerapplet/Makefile.am
+++ b/timerapplet/Makefile.am
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
-I$(srcdir) \
$(DISABLE_DEPRECATED_CFLAGS)
@@ -9,7 +8,7 @@ APPLET_LOCATION = $(libexecdir)/timer-applet
libexec_PROGRAMS = timer-applet
timer_applet_SOURCES = timerapplet.c
-timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
+timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(LIBNOTIFY_LIBS)
timer_applet_CFLAGS = $(WARN_CFLAGS)
appletsdir = $(datadir)/mate-panel/applets
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index 3bc5a097..493c0cf5 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -1,6 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir) \
$(MATE_APPLETS4_CFLAGS) \
- $(MATEDESKTOP_CFLAGS) \
$(GIO_CFLAGS) \
-DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\" \
${WARN_CFLAGS}
@@ -16,7 +15,6 @@ trashapplet_SOURCES = \
trashapplet_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
$(GIO_LIBS) \
-lX11