summaryrefslogtreecommitdiff
path: root/null_applet/Makefile.am
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-12-08 22:17:07 +0100
committerStefano Karapetsas <[email protected]>2012-12-08 22:17:07 +0100
commite0ce3b5268bc89d6f620c858e69f76629629c1ae (patch)
tree8c26bbdc34369cd209344b70a873739b95ee317c /null_applet/Makefile.am
parentf4c572e425cfe95fffb6eb62ecef169c97fb8031 (diff)
downloadmate-applets-e0ce3b5268bc89d6f620c858e69f76629629c1ae.tar.bz2
mate-applets-e0ce3b5268bc89d6f620c858e69f76629629c1ae.tar.xz
remove mixer applet (moved to mate-media package)
Diffstat (limited to 'null_applet/Makefile.am')
-rw-r--r--null_applet/Makefile.am15
1 files changed, 3 insertions, 12 deletions
diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am
index c43e0027..297a1dae 100644
--- a/null_applet/Makefile.am
+++ b/null_applet/Makefile.am
@@ -1,18 +1,13 @@
INCLUDES = \
-I. \
-I$(srcdir) \
- $(MATE_APPLETS_CFLAGS)
-
-## The null applet takes over if the mixer isn't built.
-if !BUILD_MIXER_APPLET
-mixer_server_in = MATE_MixerApplet.server.in
-endif
+ $(MATE_APPLETS4_CFLAGS)
libexec_PROGRAMS = null_applet
null_applet_SOURCES = null_applet.c
-null_applet_LDADD = $(MATE_APPLETS_LIBS)
+null_applet_LDADD = $(MATE_APPLETS4_LIBS)
serverdir = $(libdir)/matecomponent/servers
server_in_files = \
@@ -20,8 +15,7 @@ server_in_files = \
MATE_CDPlayerApplet.server.in \
MATE_MailcheckApplet_Factory.server.in \
MATE_Panel_WirelessApplet.server.in \
- MATE_KeyboardApplet.server.in \
- $(mixer_server_in)
+ MATE_KeyboardApplet.server.in
server_DATA = $(server_in_files:.server.in=.server)
@INTLTOOL_SERVER_RULE@
@@ -31,14 +25,11 @@ MATE_NullApplet_Factory.server.in: MATE_NullApplet_Factory.server.in.in
CLEANFILES = MATE_NullApplet_Factory.server.in $(server_DATA)
-## Note that the mixer applet server.in file is always distributed, but
-## note always used.
EXTRA_DIST = \
MATE_NullApplet_Factory.server.in.in \
MATE_CDPlayerApplet.server.in \
MATE_MailcheckApplet_Factory.server.in \
MATE_Panel_WirelessApplet.server.in \
- MATE_MixerApplet.server.in \
MATE_KeyboardApplet.server.in
-include $(top_srcdir)/git.mk