summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-01-30 16:04:57 +0100
committerStefano Karapetsas <[email protected]>2014-01-30 16:04:57 +0100
commit8795f06d464700494234e589020e5e29854aeb8c (patch)
treef2525b646023e533f03d5c80240563b89ab5b152 /Makefile.am
parentc8a85a6aa040c1d2505b957af4cfb4bd39466504 (diff)
parent064212a25bea1fcf8901cd0a1d55aae0899f627c (diff)
downloadmate-applets-8795f06d464700494234e589020e5e29854aeb8c.tar.bz2
mate-applets-8795f06d464700494234e589020e5e29854aeb8c.tar.xz
Merge branch 'dev-timer-applet'
Closes #45 https://github.com/mate-desktop/mate-applets/issues/45
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 537372ce..0e988730 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,8 @@ if BUILD_INVEST_APPLET
invest_applet_SUBDIR = invest-applet
endif
-if BUILD_TIMER_APPLET
-timer_applet_SUBDIR = timer-applet
+if BUILD_TIMERAPPLET
+timerapplet_SUBDIR = timerapplet
endif
always_built_SUBDIRS = \
@@ -59,7 +59,7 @@ SUBDIRS = \
$(accessx_status_SUBDIR) \
$(invest_applet_SUBDIR) \
$(cpufreq_SUBDIR) \
- $(timer_applet_SUBDIR)
+ $(timerapplet_SUBDIR)
DIST_SUBDIRS = \
po \
@@ -73,10 +73,10 @@ DIST_SUBDIRS = \
man \
accessx-status \
stickynotes \
+ timerapplet \
trashapplet \
cpufreq \
invest-applet \
- timer-applet \
command \
null_applet